2008-04-25 [colin] 3.4.0cvs12
authorColin Leroy <colin@colino.net>
Fri, 25 Apr 2008 13:54:33 +0000 (13:54 +0000)
committerColin Leroy <colin@colino.net>
Fri, 25 Apr 2008 13:54:33 +0000 (13:54 +0000)
* src/Makefile.am
* src/w32-logo.ico
* src/w32-resource.rc
Patch from Marcus Brinkmann to set an icon on w32.

ChangeLog
PATCHSETS
configure.ac
src/Makefile.am
src/w32-logo.ico [new file with mode: 0644]
src/w32-resource.rc [new file with mode: 0644]

index 289bab0..683872b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-25 [colin]     3.4.0cvs12
+
+       * src/Makefile.am
+       * src/w32-logo.ico
+       * src/w32-resource.rc
+               Patch from Marcus Brinkmann to set an icon on w32.
+
 2008-04-24 [colin]     3.4.0cvs11
 
        * src/inc.c
index 815dcd5..e6941f8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.443 -r 1.382.2.444 src/compose.c;  cvs diff -u -r 1.52.2.62 -r 1.52.2.63 src/prefs_folder_item.c;  cvs diff -u -r 1.12.2.61 -r 1.12.2.62 src/prefs_template.c;  cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/quote_fmt.c;  ) > 3.4.0cvs9.patchset
 ( cvs diff -u -r 1.204.2.166 -r 1.204.2.167 src/prefs_common.c;  ) > 3.4.0cvs10.patchset
 ( cvs diff -u -r 1.149.2.89 -r 1.149.2.90 src/inc.c;  cvs diff -u -r 1.29.2.13 -r 1.29.2.14 src/inc.h;  cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/ldif.c;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/ldif.h;  ) > 3.4.0cvs11.patchset
+( cvs diff -u -r 1.155.2.84 -r 1.155.2.85 src/Makefile.am;  diff -u /dev/null src/w32-logo.ico;  diff -u /dev/null src/w32-resource.rc;  ) > 3.4.0cvs12.patchset
index fce213d..c418798 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 9be6f54..3215c5d 100644 (file)
@@ -14,6 +14,21 @@ install-exec-hook:
        @rm -f $(DESTDIR)$(bindir)/sylpheed-claws
        @ln -s claws-mail $(DESTDIR)$(bindir)/sylpheed-claws
 
+if PLATFORM_WIN32
+LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
+     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+
+%.o : %.rc
+       $(LTRCCOMPILE) -i $< -o $@
+
+claws_mail_res_ldflag = -Wl,w32-resource.o
+claws_mail_deps = w32-resource.o
+else
+claws_mail_res_ldflag =
+claws_mail_deps =
+endif
+
 claws_mail_SOURCES = \
        account.c \
        action.c \
@@ -311,6 +326,7 @@ BUILT_SOURCES = \
        quote_fmt_parse.h
 
 EXTRA_DIST = \
+       w32-logo.ico w32-resource.rc \
        pixmaps/addr_one.xpm \
        pixmaps/addr_two.xpm \
        pixmaps/address_book.xpm \
@@ -483,7 +499,11 @@ arch_ldflags :=
 endif
 
 claws_mail_LDFLAGS = \
-       $(arch_ldflags) -export-dynamic
+       $(arch_ldflags) -export-dynamic $(claws_mail_res_ldflag)
+
+claws_mail_DEPENDENCIES = $(claws_mail_deps) \
+       $(etpan_library) \
+       gtk/libclawsgtk.la
 
 claws_mail_LDADD = \
        $(etpan_library) \
diff --git a/src/w32-logo.ico b/src/w32-logo.ico
new file mode 100644 (file)
index 0000000..e33537c
Binary files /dev/null and b/src/w32-logo.ico differ
diff --git a/src/w32-resource.rc b/src/w32-resource.rc
new file mode 100644 (file)
index 0000000..e8f424e
--- /dev/null
@@ -0,0 +1 @@
+1 ICON "w32-logo.ico"