From: Kevin Wasserman <krwasserman@painless-security.com>
Date: Wed, 4 Mar 2015 19:25:50 +0000 (-0500)
Subject: Ensure icons are built as appropriate on windows
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=c7ecae3ec02fd1f2db976dd481052c242cc80cf8;hp=835741360d75adcad024333be9ebf9bad78fcd6e;p=moonshot-ui.git

Ensure icons are built as appropriate on windows
---

diff --git a/Makefile.am b/Makefile.am
index 0df22d8..61fa5e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -232,7 +232,10 @@ if OS_WIN32
 ##    pulls in the icons required by moonshot and converts svg's to png's (we have
 ##    no svg support built in to Windows Gtk+ right now).
 
-icons:
+BUILT_ICONS = share/icons/avatar-default.png
+
+icons: $(BUILT_ICONS)
+$(BUILT_ICONS) :
 	mkdir -p share/icons
 	cp ${prefix}/share/icons/gnome/48x48/status/avatar-default.png share/icons
 	"${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png
@@ -246,7 +249,7 @@ icons:
 
 installer: moonshot.msi
 
-moonshot.wixlib: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
+moonshot.wixlib: windows/app.wxs windows/config.wxi $(bin_PROGRAMS) $(BUILT_ICONS)
 	"${WIX_CANDLE}" $<
 	"${WIX_LIT}" -bf -b ${prefix} -b /usr -b /c/mingw -out moonshot.wixlib app.wixobj