From 0880b6433517052e9bd405947e62003392811590 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 20 Feb 2013 08:16:15 +0000 Subject: [PATCH] 2013-02-20 [colin] 3.9.0cvs82 * src/plugins/bogofilter/Makefile.am * src/plugins/clamd/Makefile.am * src/plugins/demo/Makefile.am * src/plugins/dillo_viewer/Makefile.am * src/plugins/fancy/Makefile.am * src/plugins/fetchinfo/Makefile.am * src/plugins/gdata/Makefile.am * src/plugins/mailmbox/Makefile.am * src/plugins/newmail/Makefile.am * src/plugins/notification/Makefile.am * src/plugins/pdf_viewer/Makefile.am * src/plugins/perl/Makefile.am * src/plugins/python/Makefile.am * src/plugins/spamassassin/Makefile.am * src/plugins/trayicon/Makefile.am * src/plugins/vcalendar/libical/libical/Makefile.am Fix out-of-tree build --- ChangeLog | 20 +++++++++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/bogofilter/Makefile.am | 1 + src/plugins/clamd/Makefile.am | 1 + src/plugins/demo/Makefile.am | 1 + src/plugins/dillo_viewer/Makefile.am | 1 + src/plugins/fancy/Makefile.am | 1 + src/plugins/fetchinfo/Makefile.am | 1 + src/plugins/gdata/Makefile.am | 1 + src/plugins/mailmbox/Makefile.am | 1 + src/plugins/newmail/Makefile.am | 1 + src/plugins/notification/Makefile.am | 1 + src/plugins/pdf_viewer/Makefile.am | 1 + src/plugins/perl/Makefile.am | 1 + src/plugins/python/Makefile.am | 1 + src/plugins/spamassassin/Makefile.am | 1 + src/plugins/trayicon/Makefile.am | 1 + .../vcalendar/libical/libical/Makefile.am | 2 +- 19 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de986fc14..c0762261e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2013-02-20 [colin] 3.9.0cvs82 + + * src/plugins/bogofilter/Makefile.am + * src/plugins/clamd/Makefile.am + * src/plugins/demo/Makefile.am + * src/plugins/dillo_viewer/Makefile.am + * src/plugins/fancy/Makefile.am + * src/plugins/fetchinfo/Makefile.am + * src/plugins/gdata/Makefile.am + * src/plugins/mailmbox/Makefile.am + * src/plugins/newmail/Makefile.am + * src/plugins/notification/Makefile.am + * src/plugins/pdf_viewer/Makefile.am + * src/plugins/perl/Makefile.am + * src/plugins/python/Makefile.am + * src/plugins/spamassassin/Makefile.am + * src/plugins/trayicon/Makefile.am + * src/plugins/vcalendar/libical/libical/Makefile.am + Fix out-of-tree build + 2013-02-19 [colin] 3.9.0cvs81 * configure.ac diff --git a/PATCHSETS b/PATCHSETS index 31151317a..6f49fc07e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4579,3 +4579,4 @@ ( diff -u /dev/null src/plugins/clamd/libclamd/.cvsignore; ) > 3.9.0cvs79.patchset ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/notification/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pdf_viewer/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/python/Makefile.am; ) > 3.9.0cvs80.patchset ( cvs diff -u -r 1.654.2.4657 -r 1.654.2.4658 configure.ac; ) > 3.9.0cvs81.patchset +( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/bogofilter/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/clamd/Makefile.am; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/plugins/demo/Makefile.am; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/plugins/dillo_viewer/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fetchinfo/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/gdata/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/mailmbox/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/newmail/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/notification/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pdf_viewer/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/perl/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/python/Makefile.am; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/plugins/spamassassin/Makefile.am; cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/plugins/trayicon/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/libical/libical/Makefile.am; ) > 3.9.0cvs82.patchset diff --git a/configure.ac b/configure.ac index 647d99e4d..c96e27b3c 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=81 +EXTRA_VERSION=82 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am index e4857ef7a..a4d467579 100644 --- a/src/plugins/bogofilter/Makefile.am +++ b/src/plugins/bogofilter/Makefile.am @@ -21,6 +21,7 @@ bogofilter_la_LIBADD = $(cygwin_export_lib) \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am index f2fccb2a2..69ce34a47 100644 --- a/src/plugins/clamd/Makefile.am +++ b/src/plugins/clamd/Makefile.am @@ -20,6 +20,7 @@ INCLUDES = \ -I$(top_srcdir)/src/plugins/clamd/libclamd \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/demo/Makefile.am b/src/plugins/demo/Makefile.am index cd71a185d..39b849e21 100644 --- a/src/plugins/demo/Makefile.am +++ b/src/plugins/demo/Makefile.am @@ -18,6 +18,7 @@ demo_la_LIBADD = $(cygwin_export_lib) \ $(GTK_LIBS) INCLUDES = \ -I$(top_srcdir)/src \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/common AM_CPPFLAGS = \ diff --git a/src/plugins/dillo_viewer/Makefile.am b/src/plugins/dillo_viewer/Makefile.am index 1d4948dff..2d135ec11 100644 --- a/src/plugins/dillo_viewer/Makefile.am +++ b/src/plugins/dillo_viewer/Makefile.am @@ -21,6 +21,7 @@ dillo_viewer_la_LIBADD = $(cygwin_export_lib) \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am index ff65d5496..ddd3ec2bc 100644 --- a/src/plugins/fancy/Makefile.am +++ b/src/plugins/fancy/Makefile.am @@ -19,6 +19,7 @@ fancy_la_LDFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am index fde86c232..e223ebd09 100644 --- a/src/plugins/fetchinfo/Makefile.am +++ b/src/plugins/fetchinfo/Makefile.am @@ -18,6 +18,7 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk EXTRA_DIST= diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am index abc62eeb3..14f68656b 100644 --- a/src/plugins/gdata/Makefile.am +++ b/src/plugins/gdata/Makefile.am @@ -19,6 +19,7 @@ gdata_plugin_la_LDFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am index 234f6023a..ef0d22c25 100644 --- a/src/plugins/mailmbox/Makefile.am +++ b/src/plugins/mailmbox/Makefile.am @@ -39,4 +39,5 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am index 479bd4e52..af4ddbdc6 100644 --- a/src/plugins/newmail/Makefile.am +++ b/src/plugins/newmail/Makefile.am @@ -16,4 +16,5 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am index 347c361b1..dd55ad0b6 100644 --- a/src/plugins/notification/Makefile.am +++ b/src/plugins/notification/Makefile.am @@ -81,6 +81,7 @@ INCLUDES = \ -I$(top_srcdir)/src/plugins/notification/gtkhotkey \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am index 55caea339..36eef7dc5 100644 --- a/src/plugins/pdf_viewer/Makefile.am +++ b/src/plugins/pdf_viewer/Makefile.am @@ -14,6 +14,7 @@ pdf_viewer_la_LDFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am index c99bb4edd..d4f22d120 100644 --- a/src/plugins/perl/Makefile.am +++ b/src/plugins/perl/Makefile.am @@ -22,4 +22,5 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am index 1b3fd1350..8ce54f865 100644 --- a/src/plugins/python/Makefile.am +++ b/src/plugins/python/Makefile.am @@ -29,6 +29,7 @@ python_plugin_la_LDFLAGS = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am index 26e54e047..de323c34d 100644 --- a/src/plugins/spamassassin/Makefile.am +++ b/src/plugins/spamassassin/Makefile.am @@ -23,6 +23,7 @@ spamassassin_la_LIBADD = $(cygwin_export_lib) \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/trayicon/Makefile.am b/src/plugins/trayicon/Makefile.am index bcc063d15..c5c102356 100644 --- a/src/plugins/trayicon/Makefile.am +++ b/src/plugins/trayicon/Makefile.am @@ -25,6 +25,7 @@ trayicon_la_LIBADD = \ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/common \ + -I$(top_builddir)/src/common \ -I$(top_srcdir)/src/gtk AM_CPPFLAGS = \ diff --git a/src/plugins/vcalendar/libical/libical/Makefile.am b/src/plugins/vcalendar/libical/libical/Makefile.am index aac17a09e..579762b75 100644 --- a/src/plugins/vcalendar/libical/libical/Makefile.am +++ b/src/plugins/vcalendar/libical/libical/Makefile.am @@ -34,7 +34,7 @@ LEX_OUTPUT_ROOT = lex.ical_yy INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir) \ + -I$(top_srcdir) \ -I$(top_builddir) \ -I$(srcdir) \ -I$(top_srcdir)/src/plugins/vcalendar/libical \ -- 2.25.1