diff -r 000000000000 -r 6474c204b198 services/metrics/Makefile.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/services/metrics/Makefile.in	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+testing_modules := \
+  mocks.jsm \
+  $(NULL)
+
+# We install Metrics.jsm into the "main" JSM repository and the rest in
+# services. External consumers should only go through Metrics.jsm.
+MAIN_JS_MODULE := Metrics.jsm
+MAIN_JS_MODULE_PATH = $(FINAL_TARGET)/modules
+PP_TARGETS += MAIN_JS_MODULE
+
+TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules))
+TESTING_JS_MODULE_DIR := services/metrics
+
+include $(topsrcdir)/config/rules.mk
+
+# Add extra prerequisites until bug 837792 is addressed.
+$(FINAL_TARGET)/modules/Metrics.jsm: Metrics.jsm providermanager.jsm dataprovider.jsm storage.jsm