Re-add old method for Expat library detection during configure.

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fa9657d188616eae413c2ad9821162beb878859c..3fdb4aabf4250332b5abc8c37029ad7a8e98517c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
+# Copyright 1999-2014 the Claws Mail team.
+# This file is part of Claws Mail package, and distributed under the
+# terms of the General Public License version 3 (or later).
+# See COPYING file for license details.
+
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
+AUTOMAKE_OPTIONS = dist-bzip2 dist-xz
 
 SUBDIRS = m4 po src tools config doc manual
 
@@ -8,13 +13,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
@@ -41,7 +49,7 @@ 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
+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
@@ -68,6 +76,17 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = claws-mail.pc
 
 clawsincludedir = $(pkgincludedir)
+clawsinclude_HEADERS = \
+       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