Bug 1219122 - Move webapprt.ini definition to moz.build. r=mshal

config/faster/rules.mk

@@ -45,7 +45,6 @@ default: $(addprefix install-,$(INSTALL_MANIFESTS))
 default: $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS))
 default: $(TOPOBJDIR)/dist/bin/greprefs.js
 default: $(TOPOBJDIR)/dist/bin/platform.ini
-default: $(TOPOBJDIR)/dist/bin/webapprt/webapprt.ini
 
 # Targets from the recursive make backend to be built for a default build
 default: $(TOPOBJDIR)/config/makefiles/xpidl/xpidl
@@ -129,7 +128,6 @@ $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS)): FORCE
 # Files to build with the recursive backend and simply copy
 $(TOPOBJDIR)/dist/bin/greprefs.js: $(TOPOBJDIR)/modules/libpref/greprefs.js
 $(TOPOBJDIR)/dist/bin/platform.ini: $(TOPOBJDIR)/toolkit/xre/platform.ini
-$(TOPOBJDIR)/dist/bin/webapprt/webapprt.ini: $(TOPOBJDIR)/webapprt/webapprt.ini
 
 # The xpidl target in config/makefiles/xpidl requires the install manifest for
 # dist/idl to have been processed.

webapprt/Makefile.in

@@ -13,10 +13,4 @@ libs:: $(call mkdir_deps,$(FINAL_TARGET))
 MOZ_APP_BUILDID := $(shell cat $(DEPTH)/config/buildid)
 DEFINES += -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID)
 
-webapprt.ini: application.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
-	$(call py_action,preprocessor,$(DEFINES) $< -o $@)
-
-libs:: webapprt.ini
-	$(INSTALL) webapprt.ini $(FINAL_TARGET)
-
-GARBAGE += webapprt.ini
+$(FINAL_TARGET)/webapprt.ini: $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt

webapprt/moz.build

@@ -53,3 +53,7 @@ JAR_MANIFESTS += ['jar.mn']
 JS_PREFERENCE_FILES += [
     'prefs.js',
 ]
+
+DIST_FILES += [
+    'webapprt.ini',
+]