Use gtk_combo_box_new_text only if supported

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f432ee9da4b1b16b417543782231769379cb3475..ee4ffbd308a3eae99fabfd00d1d04ab27338dedf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,43 @@
+# Makefile.am for toplevel directory
+# This file is part of Claws Mail package.
+# 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
 
+# when changing the name or location of the .desktop file,
+# also update src/common/Makefile.am
+desktop_in_files = claws-mail.desktop.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
+
+appdata_in_files = claws-mail.appdata.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+@INTLTOOL_XML_RULE@
+
 EXTRA_DIST = \
        ChangeLog \
        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 \
+       $(desktop_in_files) \
        claws-mail.png \
+       $(appdata_DATA) \
+       $(appdata_in_files) \
        autogen.sh \
-       claws-features.h.in
+       claws-features.h.in \
+       version
 
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
@@ -27,11 +49,6 @@ 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
@@ -42,7 +59,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
@@ -74,3 +91,12 @@ clawsinclude_HEADERS = \
 
 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