Bug 912292 - Fix a few rules relying on being executed after traversing subdirectories. r=gps

b2g/app/Makefile.in

@@ -118,7 +118,7 @@ libs-preqs = \
   $(NULL)
 
 .PHONY: repackage
-libs repackage:: $(libs-preqs)
+tools repackage:: $(libs-preqs)
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
 	sed -e "s/%MOZ_APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MOZ_APP_NAME%/$(MOZ_APP_NAME)/" -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%APP_BINARY%/$(APP_BINARY)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist

browser/app/Makefile.in

@@ -170,7 +170,7 @@ endif
 MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/config/buildid)
 
 .PHONY: repackage
-libs repackage:: $(PROGRAM)
+tools repackage:: $(PROGRAM)
 	$(MKDIR) -p $(dist_dest)/Contents/MacOS
 	$(MKDIR) -p $(dist_dest)/Contents/Resources/$(AB).lproj
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(dist_dest) --exclude English.lproj

browser/metro/locales/import/Makefile.in

@@ -47,4 +47,4 @@ bookmarks: bookmarks.inc
 	  -DAB_CD=$(AB_CD) \
 	  $(bookmarks-src) > ../bookmarks.json
 
-libs:: bookmarks
+export:: bookmarks

xulrunner/app/Makefile.in

@@ -132,7 +132,7 @@ FRAMEWORK_DIR = \
 $(FRAMEWORK_DIR)/Resources:
 	$(NSINSTALL) -D $@
 
-libs:: $(PROGRAM) $(FRAMEWORK_DIR)/Resources
+tools:: $(PROGRAM) $(FRAMEWORK_DIR)/Resources
 	$(NSINSTALL) $(srcdir)/macbuild/InfoPlist.strings $(FRAMEWORK_DIR)/Resources
 	sed -e "s/APP_VERSION/$(APP_VERSION)/" $(srcdir)/macbuild/Info.plist.in > $(FRAMEWORK_DIR)/Info.plist
 	rsync -av $(DIST)/bin/ $(FRAMEWORK_DIR) --exclude mangle --exclude shlibsign