From 51f31c834d25ca87f5fa2bd7f9246ef146e46c04 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 17 Apr 2015 12:15:01 -0400
Subject: [PATCH] Bug 1155738 - move xulrunner/examples/simple/Makefile.in to
 moz.build; r=mshal

---
 xulrunner/examples/simple/Makefile.in | 15 ---------------
 xulrunner/examples/simple/moz.build   |  3 +++
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 xulrunner/examples/simple/Makefile.in

diff --git a/xulrunner/examples/simple/Makefile.in b/xulrunner/examples/simple/Makefile.in
deleted file mode 100644
index cc894585c96b..000000000000
--- a/xulrunner/examples/simple/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-ICONS		= icons/simple.ico
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifneq (,$(ICONS))
-libs:: $(ICONS)
-	$(INSTALL) $^ $(FINAL_TARGET)/chrome/icons/default
-endif
diff --git a/xulrunner/examples/simple/moz.build b/xulrunner/examples/simple/moz.build
index 974a0a25335b..2a46f05c0283 100644
--- a/xulrunner/examples/simple/moz.build
+++ b/xulrunner/examples/simple/moz.build
@@ -17,3 +17,6 @@ JS_PREFERENCE_FILES += [
 DIST_FILES += [
     'application.ini',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    FINAL_TARGET_FILES.chrome.icons.default += ['icons/simple.ico']