clean up Makefiles

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index acfab49..d8b319e 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-05-25 [paul]      0.9.10claws67.6
+
+       * Makefile.am
+         src/Makefile.am
+               clean up
+
 2004-05-25 [paul]      0.9.10claws67.5
 
        * replace deprecated gtk_signal... functions

diff --git a/Makefile.am b/Makefile.am
index cd31097..c95c640 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = m4 po src tools config intl doc
 EXTRA_DIST = \
        ChangeLog.claws \
        ChangeLog.jp \
-       ChangeLog-gtk2 \
+       ChangeLog-gtk2.claws \
        ChangeLog-gtk2.jp \
        README.claws \
        README.jp \

diff --git a/configure.ac b/configure.ac
index 591eb22..4191172 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=67.5
+EXTRA_VERSION=67.6
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/Makefile.am b/src/Makefile.am
index f6ac028..2a40d99 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,5 @@
 SUBDIRS = common gtk plugins
 
-
-if PLATFORM_WIN32
-
-SYLPHEED_RES = sylpheed.res
-
-sylpheed.rc:
-       echo "SYLPHEED ICON sylpheed.ico" > sylpheed.rc
-
-sylpheed.res: sylpheed.rc
-       $(WINDRES) $< -O coff -o $@
-
-endif
-
-
 bin_PROGRAMS = sylpheed
 
 sylpheed_SOURCES = \
@@ -273,7 +259,6 @@ BUILT_SOURCES = \
        quote_fmt_parse.h
 
 EXTRA_DIST = \
-       sylpheed.ico \
        pixmaps/address_book.xpm \
        pixmaps/address_search.xpm \
        pixmaps/address.xpm \
@@ -378,8 +363,7 @@ sylpheed_LDADD = \
        $(OPENSSL_LIBS) \
        $(COMPFACE_LIBS) \
        $(JPILOT_LIBS) \
-       $(LIBICONV) \
-       $(SYLPHEED_RES)
+       $(LIBICONV)
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Sylpheed\" \