[evolution] Add iconrc support for Evolution. The windows binary

[Bharath Acharya <abharath src gnome org>]

commit fb970ccf14e33d92cfb9409d44f7b06355e958fc
Author: Fridrich Strba <FStrba novell com>
Date:   Mon May 4 12:12:03 2009 +0530

    Add iconrc support for Evolution. The windows binary
    would now have the Evolution icon.
---
 configure.in              |   10 ++++++++++
 shell/Makefile.am         |   16 ++++++++++++++--
 shell/evolution-icon.rc   |    4 ++++
 shell/evolution-mail.ico  |  Bin 0 -> 19622 bytes
 shell/evolution-memos.ico |  Bin 0 -> 19622 bytes
 shell/evolution-tasks.ico |  Bin 0 -> 19622 bytes
 shell/evolution.ico       |  Bin 0 -> 19622 bytes
 7 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index d46a1f1..1bf1b0c 100644
--- a/configure.in
+++ b/configure.in
@@ -169,6 +169,16 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
 AC_SUBST(NO_UNDEFINED)
 AC_SUBST(SOEXT)
 
+if test "$os_win32" = "yes"; then
+  AC_CHECK_TOOL(WINDRES, windres, :)
+else
+  WINDRES=":"
+fi
+
+AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:")
+
+AC_SUBST(WINDRES)
+
 # Check for base dependencies early.
 PKG_CHECK_MODULES(GNOME_PLATFORM,
         [glib-2.0 >= glib_minimum_version
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8a7df1b..6d47f6e 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -113,6 +113,10 @@ libeshell_la_LIBADD =					\
 
 # Evolution executable
 
+if HAVE_WINDRES
+EVOLUTIONICONRC = evolution-icon.o
+endif
+
 evolution_SOURCES =				\
 	$(DATASERVER_IDL_GENERATED)		\
 	$(NM_SUPPORT_FILES)			\
@@ -147,7 +151,8 @@ evolution_LDADD =							\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(TZDIALOG_LIBS)						\
-	$(SHELL_LIBS)
+	$(SHELL_LIBS) \
+	$(EVOLUTIONICONRC)
 
 if OS_WIN32
 evolution_LDFLAGS = -mwindows
@@ -229,7 +234,12 @@ EXTRA_DIST = 					\
 	$(glade_DATA)				\
 	$(schema_in_files)			\
 	ChangeLog.pre-1-4			\
-	evolution-nognome.in
+	evolution-nognome.in			\
+	evolution-icon.rc			\
+	evolution.ico				\
+	evolution-mail.ico			\
+	evolution-memos.ico			\
+	evolution-tasks.ico
 
 # Purify support
 
@@ -255,5 +265,7 @@ dist-hook:
 
 noinst_SCRIPTS = evolution-nognome
 
+evolution-icon.o: evolution.ico evolution-mail.ico evolution-memos.ico evolution-tasks.ico
+	$(WINDRES) evolution-icon.rc evolution-icon.o
 
 -include $(top_srcdir)/git.mk
diff --git a/shell/evolution-icon.rc b/shell/evolution-icon.rc
new file mode 100644
index 0000000..275dac7
--- /dev/null
+++ b/shell/evolution-icon.rc
@@ -0,0 +1,4 @@
+1	ICON	"evolution.ico"
+2	ICON	"evolution-mail.ico"
+3	ICON	"evolution-memos.ico"
+4	ICON	"evolution-tasks.ico"
diff --git a/shell/evolution-mail.ico b/shell/evolution-mail.ico
new file mode 100644
index 0000000..8922dd1
Binary files /dev/null and b/shell/evolution-mail.ico differ
diff --git a/shell/evolution-memos.ico b/shell/evolution-memos.ico
new file mode 100644
index 0000000..7fa6f4c
Binary files /dev/null and b/shell/evolution-memos.ico differ
diff --git a/shell/evolution-tasks.ico b/shell/evolution-tasks.ico
new file mode 100644
index 0000000..73c6079
Binary files /dev/null and b/shell/evolution-tasks.ico differ
diff --git a/shell/evolution.ico b/shell/evolution.ico
new file mode 100644
index 0000000..8e34f74
Binary files /dev/null and b/shell/evolution.ico differ