Fix buffer length handling in GnuTLS password encryption and decryption.

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9065980322544c0e0e9755e185d8771d97f94cfd..3fdb4aabf4250332b5abc8c37029ad7a8e98517c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,12 @@
-# Makefile.am for toplevel directory
-# This file is part of Claws Mail package.
+# 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 dist-xz
 
 SUBDIRS = m4 po src tools config doc manual
-if BUILD_APPDATA
-SUBDIRS += appdata
-endif
-DIST_SUBDIRS = appdata $(SUBDIRS)
-
-# 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@
 
 EXTRA_DIST = \
        ChangeLog \
@@ -29,7 +18,7 @@ EXTRA_DIST = \
        claws-mail-128x128.png \
        claws-mail-64x64.png \
        claws-mail.pc.in \
-       $(desktop_in_files) \
+       claws-mail.desktop \
        claws-mail.png \
        autogen.sh \
        claws-features.h.in \
@@ -45,6 +34,11 @@ 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