X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=Makefile.am;h=dce9f25e91e6e396833bd2d9f12e124896ade33a;hp=a91fed0770d6196436795ebaf8ac184d16d6af76;hb=e33f136772170acc1d4cd8c370f355bea67cf3b0;hpb=d14322195e71f2355dc8cd5248e7e7a21dc7a7f2

diff --git a/Makefile.am b/Makefile.am
index a91fed077..dce9f25e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
+AUTOMAKE_OPTIONS = dist-bzip2 dist-xz
 
 SUBDIRS = m4 po src tools config doc manual
 
@@ -8,13 +8,16 @@ EXTRA_DIST = \
 	ChangeLog.gtk1 \
 	ChangeLog.pre2.0.0 \
 	ChangeLog.2.0.0-3.0.0 \
+	ChangeLog.3.0.0-3.9.0 \
 	RELEASE_NOTES \
 	claws-mail-128x128.png \
 	claws-mail-64x64.png \
 	claws-mail.pc.in \
 	claws-mail.desktop \
 	claws-mail.png \
-	autogen.sh
+	autogen.sh \
+	claws-features.h.in \
+	version
 
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
@@ -26,20 +29,26 @@ 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 $(datadir)/icons/hicolor/64x64/apps && \
+	@cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \
             mv claws-mail-64x64.png claws-mail.png
-	@cd $(datadir)/icons/hicolor/128x128/apps && \
+	@cd $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps && \
             mv claws-mail-128x128.png claws-mail.png
 
-if CLAWS_GNOME2
+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 UPDATE_GTK_ICON_CACHE
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: rename-icons update-icon-cache
-uninstall-hook: update-icon-cache
+uninstall-hook: remove-icons update-icon-cache
 
 update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then					\
@@ -54,6 +63,7 @@ update-icon-cache:
 else
 
 install-data-hook: rename-icons
+uninstall-hook: remove-icons
 
 endif
 
@@ -62,7 +72,16 @@ pkgconfig_DATA = claws-mail.pc
 
 clawsincludedir = $(pkgincludedir)
 clawsinclude_HEADERS = \
-	config.h
+	claws-features.h
 
 relnotesdir = $(docdir)
 relnotes_DATA = RELEASE_NOTES
+
+dist-local: ChangeLog
+
+maintainer-clean-local:
+	@rm -f ChangeLog
+	@rm -f version
+
+ChangeLog: version
+	@./tools/gitlog2changelog.py 3.9.0 > ChangeLog