2009-11-17 [pawel] 3.7.3cvs15

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b470dfad68be9992bc59f88555bce7b77310658d..a91fed0770d6196436795ebaf8ac184d16d6af76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,13 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
 
-if PLATFORM_WIN32
-tools = 
-else
-tools = tools
-endif
-
-SUBDIRS = m4 po src $(tools) config doc manual
+SUBDIRS = m4 po src tools config doc manual
 
 EXTRA_DIST = \
        ChangeLog \
        ChangeLog.gtk1 \
+       ChangeLog.pre2.0.0 \
+       ChangeLog.2.0.0-3.0.0 \
        RELEASE_NOTES \
        claws-mail-128x128.png \
        claws-mail-64x64.png \
@@ -23,13 +19,29 @@ EXTRA_DIST = \
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
 pixmap_DATA=claws-mail.png
+
+pixmap64dir=$(datadir)/icons/hicolor/64x64/apps
+pixmap64_DATA=claws-mail-64x64.png
+
+pixmap128dir=$(datadir)/icons/hicolor/128x128/apps
+pixmap128_DATA=claws-mail-128x128.png
+
 gnomapdir = $(datadir)/applications
 gnomap_DATA=claws-mail.desktop
 
+rename-icons:
+       @cd $(datadir)/icons/hicolor/64x64/apps && \
+            mv claws-mail-64x64.png claws-mail.png
+       @cd $(datadir)/icons/hicolor/128x128/apps && \
+            mv claws-mail-128x128.png claws-mail.png
+
 if CLAWS_GNOME2
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook:
+install-data-hook: rename-icons update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
        @-if test -z "$(DESTDIR)"; then                                 \
                 echo "Updating Gtk icon cache.";                       \
                 $(gtk_update_icon_cache);                              \
@@ -39,6 +51,10 @@ install-data-hook:
                 echo "***   $(gtk_update_icon_cache)";                 \
                echo "***";                                             \
         fi
+else
+
+install-data-hook: rename-icons
+
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig