2007-08-24 [paul] 2.10.0cvs165
authorPaul Mangan <paul@claws-mail.org>
Fri, 24 Aug 2007 13:34:45 +0000 (13:34 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 24 Aug 2007 13:34:45 +0000 (13:34 +0000)
* Makefile.am
oops! if i'm quick no-one will notice
(put back the proper file)

ChangeLog
Makefile.am
PATCHSETS
configure.ac

index f955174..902c38e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-24 [paul]      2.10.0cvs165
+
+       * Makefile.am
+               oops! if i'm quick no-one will notice
+               (put back the proper file)
+
 2007-08-24 [paul]      2.10.0cvs164
 
        * AUTHORS
index d4f1da6..015cafa 100644 (file)
@@ -1,72 +1,53 @@
-EXTRA_TOOLS = \
-       OOo2claws-mail.pl \
-       acroread2claws-mail.pl \
-       claws-mail-compose-insert-files.pl \
-       calypso_convert.pl \
-       convert_mbox.pl \
-       eud2gc.py \
-       filter_conv.pl \
-       filter_conv_new.pl \
-       fix_date.sh \
-       freshmeat_search.pl \
-       gif2xface.pl \
-       google_msgid.pl \
-       google_search.pl \
-       kmail2claws-mail.pl \
-       kmail2claws-mail_v2.pl \
-       kmail-mailbox2claws-mail.pl \
-       mairix.sh \
-       mew2claws-mail.pl \
-       multiwebsearch.pl \
-       nautilus2claws-mail.sh \
-       outlook2claws-mail.pl \
-       popfile-link.sh \
-       sylprint.pl \
-       sylprint.rc \
-       tb2claws-mail \
-       tbird2claws.py \
-       textviewer.pl \
-       textviewer.sh \
-       thunderbird-filters-convertor.pl \
-       update-po \
-       uudec \
-       uuooffice \
-       vcard2xml.py \
-       kdeservicemenu/install.sh \
-       kdeservicemenu/claws-mail-kdeservicemenu.pl
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = dist-bzip2
+
+if PLATFORM_WIN32
+tools = 
+else
+tools = tools
+endif
+
+SUBDIRS = m4 po src $(tools) config doc manual
 
 EXTRA_DIST = \
-       README \
-       README.sylprint \
-       multiwebsearch.conf \
-       kdeservicemenu/README \
-       kdeservicemenu/template_claws-mail-attach-files.desktop \
-       $(EXTRA_TOOLS)
+       ChangeLog \
+       ChangeLog.gtk1 \
+       ChangeLog.pre2.0.0 \
+       RELEASE_NOTES \
+       claws-mail-128x128.png \
+       claws-mail-64x64.png \
+       claws-mail.pc.in \
+       claws-mail.desktop \
+       claws-mail.png \
+       autogen.sh
+
+# hicolor icon theme, base class of all icon themes
+pixmapdir=$(datadir)/icons/hicolor/48x48/apps
+pixmap_DATA=claws-mail.png
+gnomapdir = $(datadir)/applications
+gnomap_DATA=claws-mail.desktop
+
+if CLAWS_GNOME2
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+       @-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
+endif
 
-MAKE_EXE = chmod u+x $(EXTRA_TOOLS)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = claws-mail.pc
 
-all-local:
-       if [ ! -d kdeservicemenu -a ! -e kdeservicemenu ]; then \
-       mkdir kdeservicemenu; \
-       fi; \
-       for file in $(EXTRA_TOOLS); do \
-       if [ ! -e ${top_builddir}/tools/$$file ]; then \
-       todir=${top_builddir}/tools; \
-       dir=$$(dirname $$file); \
-       if [ ! $$dir = . ]; then \
-       todir=$$todir/$$dir; \
-       fi; \
-       cp ${top_srcdir}/tools/$$file $$todir; \
-       fi; \
-       done;
-       $(MAKE_EXE)
+clawsincludedir = $(pkgincludedir)
+clawsinclude_HEADERS = \
+       config.h
 
-distclean-local:
-       if [ ! ${top_builddir} = ${top_srcdir} ]; then \
-       for file in $(EXTRA_TOOLS); do \
-       rm -f $$file; \
-       done; \
-       if [ -d kdeservicemenu ]; then \
-       rmdir --ignore-fail-on-non-empty kdeservicemenu; \
-       fi; \
-       fi
+relnotesdir = $(docdir)
+relnotes_DATA = RELEASE_NOTES
index 03affa8..c436e23 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.40 -r 1.1.2.41 manual/advanced.xml;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/keyboard.xml;  ) > 2.10.0cvs162.patchset
 ( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/plugins.xml;  ) > 2.10.0cvs163.patchset
 ( cvs diff -u -r 1.100.2.51 -r 1.100.2.52 AUTHORS;  cvs diff -u -r 1.24.2.21 -r 1.24.2.22 Makefile.am;  cvs diff -u -r 1.8.2.38 -r 1.8.2.39 README;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/gtk/authors.h;  cvs diff -u -r 1.25.2.21 -r 1.25.2.22 tools/Makefile.am;  cvs diff -u -r 1.30.2.23 -r 1.30.2.24 tools/README;  diff -u /dev/null tools/mew2claws-mail.pl;  ) > 2.10.0cvs164.patchset
+( cvs diff -u -r 1.24.2.22 -r 1.24.2.23 Makefile.am;  ) > 2.10.0cvs165.patchset
index e8a9528..7584f04 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=164
+EXTRA_VERSION=165
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=