X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=Makefile.am;h=043f6d5ab70ef4e41245f4d79de6fc520cc8730e;hp=5cd4ed9b89d2ae6011173f62afcfbc9973b95982;hb=8bde9802a292b258be1e5a8182e1dbe849ef38ac;hpb=5556e2313658bc1631f4667d48699486eaa3b8e8

diff --git a/Makefile.am b/Makefile.am
index 5cd4ed9b8..043f6d5ab 100644
--- 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 \
@@ -20,29 +16,60 @@ EXTRA_DIST = \
 	claws-mail.png \
 	autogen.sh
 
-if SYLPHEED_GNOME2
 # 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
+
+# when changing the name or location of the .desktop file,
+# also update src/common/Makefile.am
 gnomapdir = $(datadir)/applications
 gnomap_DATA=claws-mail.desktop
+
+rename-icons:
+	@cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \
+            mv claws-mail-64x64.png claws-mail.png
+	@cd $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps && \
+            mv claws-mail-128x128.png claws-mail.png
+
+remove-icons:
+	rm -f $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/claws-mail.png
+	rm -f $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/claws-mail.png
+
+if CLAWS_GNOME2
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: rename-icons update-icon-cache
+uninstall-hook: remove-icons update-icon-cache
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then					\
+                echo "Updating Gtk icon cache.";			\
+                $(gtk_update_icon_cache);				\
+        else								\
+                echo "*** Icon cache not updated. Remember to run:";	\
+		echo "***";						\
+                echo "***   $(gtk_update_icon_cache)";			\
+		echo "***";						\
+        fi
 else
-if SYLPHEED_GNOME
-pixmapdir=$(gnomedatadir)/pixmaps
-pixmap_DATA=claws-mail.png
-gnomapdir=$(gnomedatadir)/gnome/apps/Internet
-gnomap_DATA=claws-mail.desktop
-else
-pixmapdir=
-pixmap_DATA=
-gnomapdir=
-gnomap_DATA=
-endif
+
+install-data-hook: rename-icons
+uninstall-hook: remove-icons
+
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = claws-mail.pc
 
-sylpheedincludedir = $(pkgincludedir)
-sylpheedinclude_HEADERS = \
+clawsincludedir = $(pkgincludedir)
+clawsinclude_HEADERS = \
 	config.h
+
+relnotesdir = $(docdir)
+relnotes_DATA = RELEASE_NOTES