diff -r 000000000000 -r 6474c204b198 services/common/Makefile.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/services/common/Makefile.in	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,56 @@
+# 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/.
+
+modules := \
+  hawkclient.js \
+  hawkrequest.js \
+  storageservice.js \
+  stringbundle.js \
+  tokenserverclient.js \
+  utils.js \
+  $(NULL)
+
+pp_modules := \
+  async.js \
+  bagheeraclient.js \
+  observers.js \
+  rest.js \
+  $(NULL)
+
+testing_modules := \
+  bagheeraserver.js \
+  logging.js \
+  storageserver.js \
+  utils.js \
+  $(NULL)
+
+PREF_JS_EXPORTS = $(srcdir)/services-common.js
+
+MODULES_FILES := $(modules)
+MODULES_DEST = $(FINAL_TARGET)/modules/services-common
+INSTALL_TARGETS += MODULES
+
+TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules))
+TESTING_JS_MODULE_DIR := services-common
+
+PP_JS_MODULES := $(pp_modules)
+PP_JS_MODULES_PATH = $(FINAL_TARGET)/modules/services-common
+PP_TARGETS += PP_JS_MODULES
+
+include $(topsrcdir)/config/rules.mk
+
+# What follows is a helper to launch a standalone storage server instance.
+# Most of the code lives in a Python script in the tests directory. If we
+# ever consolidate our Python code, and/or have a supplemental driver for the
+# build system, this can go away.
+
+server_port := 8080
+
+storage-server:
+	$(PYTHON) $(srcdir)/tests/run_server.py $(topsrcdir) \
+	  $(MOZ_BUILD_ROOT) run_storage_server.js --port $(server_port)
+
+bagheera-server:
+	$(PYTHON) $(srcdir)/tests/run_server.py $(topsrcdir) \
+		$(MOZ_BUILD_ROOT) run_bagheera_server.js --port $(server_port)