diff -r 000000000000 -r 6474c204b198 toolkit/crashreporter/client/Makefile.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/crashreporter/client/Makefile.in	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,62 @@
+# vim:set ts=8 sw=8 sts=8 noet:
+# 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/.
+
+ifneq ($(OS_TARGET),Android)
+DIST_PROGRAM = crashreporter$(BIN_SUFFIX)
+
+# Don't link the updater against libmozglue.
+MOZ_GLUE_LDFLAGS =
+MOZ_GLUE_PROGRAM_LDFLAGS =
+endif
+
+ifeq ($(OS_ARCH),WINNT)
+LIBS += \
+  $(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX)
+  $(NULL)
+OS_LIBS += $(call EXPAND_LIBNAME,comctl32 shell32 wininet shlwapi)
+MOZ_WINCONSOLE = 0
+endif
+
+ifeq ($(OS_ARCH),Darwin)
+LIBS += \
+  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
+  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \
+  $(NULL)
+endif
+
+ifdef MOZ_WIDGET_GTK
+
+LIBS += \
+  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
+  $(NULL)
+OS_CXXFLAGS += $(TK_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
+OS_LIBS += $(TK_LIBS) $(MOZ_GTHREAD_LIBS)
+endif
+
+ifeq ($(OS_ARCH),SunOS)
+LIBS += \
+  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \
+  $(NULL)
+OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
+OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS)
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+ifeq ($(OS_ARCH),Darwin)
+libs::
+	$(NSINSTALL) -D $(DIST)/bin/crashreporter.app
+	rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/crashreporter.app 
+	sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
+	  iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/crashreporter.app/Contents/Resources/English.lproj/InfoPlist.strings
+	$(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS
+	$(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS
+	rm -f $(DIST)/bin/crashreporter
+endif
+
+ifeq (,$(filter-out Linux SunOS,$(OS_ARCH)))
+libs:: $(topsrcdir)/toolkit/themes/windows/global/throbber/Throbber-small.gif
+	$(INSTALL) $^ $(DIST)/bin
+endif