[Commits] [SCM] claws branch, master, updated. 3.9.3-96-gad79767
colin at claws-mail.org
colin at claws-mail.org
Fri Apr 25 10:37:20 CEST 2014
The branch master of project "claws" (Claws Mail) has been updated
via ad797671f663bcbabb05349bf7b29565b8d3e431 (commit)
via bd5f47a97b1f18a3dc0513b209d60d7187f9292d (commit)
via 795e7a1dda226ccbe98acb94e44bd95b2d4e8cc7 (commit)
from 9546a9459b887f6e437f2274233f8ece522d9ebd (commit)
- Log -----------------------------------------------------------------
commit ad797671f663bcbabb05349bf7b29565b8d3e431
Author: Colin Leroy <colin at colino.net>
Date: Fri Apr 25 10:36:28 2014 +0200
Fix another double define, and add subdir-objects where needed
diff --git a/src/plugins/notification/gtkhotkey/Makefile.am b/src/plugins/notification/gtkhotkey/Makefile.am
index b56fbde..111fe00 100644
--- a/src/plugins/notification/gtkhotkey/Makefile.am
+++ b/src/plugins/notification/gtkhotkey/Makefile.am
@@ -2,6 +2,8 @@ if BUILD_HOTKEYS
noinst_LTLIBRARIES = libcmnpgtkhotkey.la
endif
+AUTOMAKE_OPTIONS = subdir-objects
+
libcmnpgtkhotkey_la_SOURCES = \
gtk-hotkey-info.c \
gtk-hotkey-error.c \
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 585fe4b..35d241e 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -69,12 +69,6 @@ spamreport_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
spamreport_la_DEPENDENCIES = $(plugin_deps)
-IFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
spamreport_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
commit bd5f47a97b1f18a3dc0513b209d60d7187f9292d
Author: Colin Leroy <colin at colino.net>
Date: Fri Apr 25 10:32:28 2014 +0200
Fix double define
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index d30e364..5feae17 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -63,12 +63,6 @@ bsfilter_la_DEPENDENCIES = $(plugin_deps)
bsfilter_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) $(PTHREAD_LIBS)
-IFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
bsfilter_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 2b7b9f1..7c0c84d 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -72,12 +72,6 @@ fancy_la_LDFLAGS = \
$(LIBSOUP_GNOME_LIBS) \
$(CURL_LIBS)
-IFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
fancy_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
commit 795e7a1dda226ccbe98acb94e44bd95b2d4e8cc7
Author: Colin Leroy <colin at colino.net>
Date: Fri Apr 25 10:15:28 2014 +0200
Replace deprecated INCLUDES with AM_CPPFLAGS; where needed, still
keep the -I flags separated in $(IFLAGS) for $(LTRCCOMPILE).
diff --git a/src/Makefile.am b/src/Makefile.am
index 375d561..dd7eea0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ install-exec-hook:
if PLATFORM_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.o : %.rc
@@ -529,7 +529,7 @@ EXTRA_DIST = \
$(abook_extra)
-INCLUDES = \
+IFLAGS = \
-I$(srcdir)/common \
-Icommon \
-I$(srcdir)/gtk \
@@ -578,6 +578,7 @@ AM_CPPFLAGS = \
-DTARGET_ALIAS=\""$(target_triplet)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATAROOTDIR=\""$(datarootdir)"\" \
+ $(IFLAGS) \
$(ENCHANT_CFLAGS) \
$(GTK_CFLAGS) \
$(GPGME_CFLAGS) \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 1f3bdfb..36d17d6 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -70,10 +70,8 @@ clawscommoninclude_HEADERS = $(arch_headers) \
xml.h \
xmlprops.h
-INCLUDES = \
- -I$(top_srcdir)/intl
-
AM_CPPFLAGS = \
+ -I$(top_srcdir)/intl \
$(GLIB_CFLAGS) \
$(VALGRIND_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" \
diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am
index eb343b2..100df43 100644
--- a/src/etpan/Makefile.am
+++ b/src/etpan/Makefile.am
@@ -17,12 +17,10 @@ clawsetpaninclude_HEADERS = \
nntp-thread.h \
etpan-ssl.h
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(GTK_CFLAGS) \
$(LIBETPAN_CFLAGS) \
$(ENCHANT_CFLAGS)
diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index df1d5df..0718451 100644
--- a/src/plugins/acpi_notifier/Makefile.am
+++ b/src/plugins/acpi_notifier/Makefile.am
@@ -13,12 +13,11 @@ acpi_notifier_la_LDFLAGS = \
acpi_notifier_la_LIBADD = \
$(GTK_LIBS)
-INCLUDES = \
+
+acpi_notifier_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 48acae0..a63531c 100644
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -57,13 +63,8 @@ address_keeper_la_DEPENDENCIES = $(plugin_deps)
address_keeper_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS)
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+address_keeper_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index ff8cfb7..daf787e 100644
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -24,12 +24,11 @@ archive_la_LDFLAGS = \
archive_la_LIBADD = \
@ARCHIVE_LIBS@
-INCLUDES = \
+
+archive_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ -I$(top_srcdir)/src/gtk \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS)
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 1ffecd8..c2bc67a 100644
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -60,12 +66,7 @@ att_remover_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
att_remover_la_DEPENDENCIES = $(plugin_deps)
-AM_CPPFLAGS = \
+att_remover_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
-
-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/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index d40ebc4..62b7265 100644
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -57,13 +63,8 @@ attachwarner_la_DEPENDENCIES = $(plugin_deps)
attachwarner_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS)
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+attachwarner_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index 7aaa09b..45986a4 100644
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -19,13 +19,11 @@ endif
bogofilter_la_LIBADD = $(cygwin_export_lib) \
$(GTK_LIBS)
-INCLUDES = \
+bogofilter_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(ENCHANT_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index f919b05..d30e364 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -57,13 +63,14 @@ bsfilter_la_DEPENDENCIES = $(plugin_deps)
bsfilter_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) $(PTHREAD_LIBS)
-INCLUDES = \
+IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk
-AM_CPPFLAGS = \
+bsfilter_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 9ff0438..5d75965 100644
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -18,13 +18,11 @@ clamd_la_LDFLAGS = \
clamd_la_LIBADD = \
-lclamd-plugin
-INCLUDES = \
+clamd_la_CPPFLAGS = \
-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 = \
+ -I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/clamd/libclamd/Makefile.am b/src/plugins/clamd/libclamd/Makefile.am
index f984c56..3ae5f31 100644
--- a/src/plugins/clamd/libclamd/Makefile.am
+++ b/src/plugins/clamd/libclamd/Makefile.am
@@ -1,22 +1,23 @@
-INCLUDES = @GLIB_CFLAGS@ \
- @GTK_CFLAGS@ \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(CLAWS_MAIL_CFLAGS) \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/gtk
+libclamd_plugin_la_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(CLAWS_MAIL_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_srcdir)/src/gtk
if BUILD_CLAMD_PLUGIN
noinst_LTLIBRARIES = libclamd-plugin.la
endif
libclamd_plugin_la_SOURCES = \
- clamd-plugin.h \
- clamd-plugin.c
+ clamd-plugin.h \
+ clamd-plugin.c
noinst_HEADERS = clamd-plugin.h
libclamd_plugin_la_LIBADD = \
- @GLIB_LIBS@ \
- @GTK_LIBS@
+ @GLIB_LIBS@ \
+ @GTK_LIBS@
diff --git a/src/plugins/demo/Makefile.am b/src/plugins/demo/Makefile.am
index 73552e1..91806bb 100644
--- a/src/plugins/demo/Makefile.am
+++ b/src/plugins/demo/Makefile.am
@@ -18,10 +18,9 @@ endif
demo_la_LIBADD = $(cygwin_export_lib) \
$(GTK_LIBS)
-INCLUDES = \
+
+demo_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/common
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/common \
$(GLIB_CFLAGS)
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 986ee24..2b7b9f1 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -66,13 +72,14 @@ fancy_la_LDFLAGS = \
$(LIBSOUP_GNOME_LIBS) \
$(CURL_LIBS)
-INCLUDES = \
+IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk
-AM_CPPFLAGS = \
+fancy_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(WEBKIT_CFLAGS) \
diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index c606743..3e0430e 100644
--- a/src/plugins/fetchinfo/Makefile.am
+++ b/src/plugins/fetchinfo/Makefile.am
@@ -1,7 +1,7 @@
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -59,15 +59,16 @@ fetchinfo_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
fetchinfo_la_DEPENDENCIES = $(plugin_deps)
-AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
-
-INCLUDES = \
+IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk
+fetchinfo_la_CPPFLAGS = \
+ $(IFLAGS) \
+ $(CLAWS_MAIL_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS)
+
EXTRA_DIST = claws.def plugin.def version.rc
diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index a55dd05..cdecfec 100644
--- a/src/plugins/gdata/Makefile.am
+++ b/src/plugins/gdata/Makefile.am
@@ -17,14 +17,11 @@ gdata_la_LDFLAGS = \
$(GTK_LIBS) \
$(GDATA_LIBS)
-
-INCLUDES = \
+gdata_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(GDATA_CFLAGS)
diff --git a/src/plugins/geolocation/Makefile.am b/src/plugins/geolocation/Makefile.am
index f3b98ab..e15be48 100644
--- a/src/plugins/geolocation/Makefile.am
+++ b/src/plugins/geolocation/Makefile.am
@@ -14,14 +14,11 @@ geolocation_la_LDFLAGS = \
$(LIBSOUP_LIBS) \
$(CHAMPLAIN_LIBS)
-
-INCLUDES = \
+geolocation_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS) \
diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index 752c81c..8d8d4db 100644
--- a/src/plugins/libravatar/Makefile.am
+++ b/src/plugins/libravatar/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -58,13 +64,8 @@ libravatar_la_DEPENDENCIES = $(plugin_deps)
libravatar_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS)
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+libravatar_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(CURL_CFLAGS)
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 4fcaa58..e586a58 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -73,15 +79,6 @@ mailmbox_la_LIBADD = \
$(GTK_LIBS)
mailmbox_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
-
-AM_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
-
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
+ $(GTK_CFLAGS)
\ No newline at end of file
diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am
index 734966b..fd85453 100644
--- a/src/plugins/newmail/Makefile.am
+++ b/src/plugins/newmail/Makefile.am
@@ -10,12 +10,10 @@ newmail_la_SOURCES = \
newmail_la_LDFLAGS = \
-avoid-version -module
-AM_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
-
-INCLUDES = \
+newmail_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
+ -I$(top_srcdir)/src/gtk \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS)
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 7808661..9b33429 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -10,10 +10,17 @@ SUBDIRS=gtkhotkey
EXTRA_DIST = claws.def plugin.def version.rc
CFLAGS += "-Wall"
+IFLAGS = \
+ -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
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -79,14 +86,6 @@ notification_la_LDFLAGS = \
notification_la_DEPENDENCIES = $(plugin_deps) \
$(hotkey_lib_path)
-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
-
-
notification_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) \
$(libnotify_LIBS) \
@@ -95,6 +94,7 @@ notification_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(hotkey_lib_path)
notification_la_CPPFLAGS = \
+ $(IFLAGS) \
$(NOTIFY_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/notification/gtkhotkey/Makefile.am b/src/plugins/notification/gtkhotkey/Makefile.am
index f6c930d..b56fbde 100644
--- a/src/plugins/notification/gtkhotkey/Makefile.am
+++ b/src/plugins/notification/gtkhotkey/Makefile.am
@@ -32,7 +32,7 @@ libcmnpgtkhotkey_la_LIBADD = \
$(GTK_LIBS) \
$(CM_NP_HOTKEY_LIBS)
-AM_CPPFLAGS = \
+libcmnpgtkhotkey_la_CPPFLAGS = \
-DGTK_HOTKEY_COMPILATION \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 46c4e5d..a4beb82 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -13,13 +13,11 @@ pdf_viewer_la_LDFLAGS = \
$(GTK_LIBS) \
$(POPPLER_LIBS)
-INCLUDES = \
+pdf_viewer_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(POPPLER_CFLAGS)
\ No newline at end of file
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 6fd4ba5..b696d50 100644
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -17,16 +17,14 @@ perl_la_LIBADD = \
$(PERL_LDFLAGS) \
$(GTK_LIBS)
-AM_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- $(PERL_CFLAGS)
-
-INCLUDES = \
+perl_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
+ -I$(top_srcdir)/src/gtk \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(PERL_CFLAGS)
EXTRA_DIST = cm_perl.pod
diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index 31568ae..5b572f6 100644
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = version.rc plugin.def claws.def
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -76,13 +82,8 @@ pgpcore_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) \
$(GPGME_LIBS) \
$(ENCHANT_LIBS)
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+pgpcore_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(GPGME_CFLAGS) \
diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index 810c1a6..bd67cf4 100644
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -1,10 +1,15 @@
EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -70,13 +75,8 @@ pgpinline_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
$(GTK_LIBS) \
$(GPGME_LIBS)
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+pgpinline_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(GPGME_CFLAGS) \
diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 999e4e6..43f9a47 100644
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -69,13 +75,8 @@ pgpmime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
$(GPGME_LIBS) \
$(ENCHANT_LIBS)
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+pgpmime_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(GPGME_CFLAGS) \
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index dcade0b..d969ca3 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -36,13 +36,12 @@ python_la_LDFLAGS = \
$(PYGTK_LIBS) \
$(PYTHON_LIBS)
-INCLUDES = \
+
+python_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(PYTHON_CFLAGS) \
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 50605c3..ff93d12 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -47,12 +53,6 @@ if BUILD_RSSYL_PLUGIN
plugin_LTLIBRARIES = rssyl.la
endif
-INCLUDES= \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
rssyl_la_LDFLAGS = \
$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
-avoid-version -module \
@@ -63,7 +63,8 @@ rssyl_la_DEPENDENCIES = $(plugin_deps)
rssyl_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) $(LIBXML_LIBS) $(CURL_LIBS)
-AM_CPPFLAGS = \
+rssyl_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXML_CFLAGS) \
diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index 9b34c3b..0b843d6 100644
--- a/src/plugins/smime/Makefile.am
+++ b/src/plugins/smime/Makefile.am
@@ -1,10 +1,15 @@
EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -71,13 +76,8 @@ smime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
$(GPGME_LIBS) \
$(ENCHANT_LIBS)
-INCLUDES = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+smime_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(GPGME_CFLAGS) \
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 21f3994..585fe4b 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -1,9 +1,15 @@
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -63,13 +69,14 @@ spamreport_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
spamreport_la_DEPENDENCIES = $(plugin_deps)
-INCLUDES = \
+IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk
-AM_CPPFLAGS = \
+spamreport_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(CURL_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index 4377260..56efafe 100644
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -21,13 +21,11 @@ endif
spamassassin_la_LIBADD = $(cygwin_export_lib) \
$(GTK_LIBS)
-INCLUDES = \
+spamassassin_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gtk \
$(ENCHANT_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index 941eaff..020a17e 100644
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -72,12 +72,13 @@ noinst_HEADERS = \
tnef-types.h \
ytnef.h
-INCLUDES = \
+IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
-I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk
-AM_CPPFLAGS = \
+tnef_parse_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index 022efab..98c7925 100644
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -1,10 +1,17 @@
SUBDIRS = libical
EXTRA_DIST = claws.def plugin.def version.rc
+IFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk \
+ -I$(top_srcdir)/src/plugins/vcalendar/libical/libical
+
if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
%.lo : %.rc
@@ -48,13 +55,6 @@ if BUILD_VCALENDAR_PLUGIN
plugin_LTLIBRARIES = vcalendar.la
endif
-INCLUDES= \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk \
- -I$(top_srcdir)/src/plugins/vcalendar/libical/libical
-
vcalendar_la_SOURCES = \
plugin.c \
vcalendar.c vcalendar.h \
@@ -83,7 +83,8 @@ vcalendar_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(CURL_LIBS) \
$(top_builddir)/src/plugins/vcalendar/libical/libical/libical.la
-AM_CPPFLAGS = \
+vcalendar_la_CPPFLAGS = \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(CURL_CFLAGS)
diff --git a/src/plugins/vcalendar/libical/libical/Makefile.am b/src/plugins/vcalendar/libical/libical/Makefile.am
index 16714ae..e7d886f 100644
--- a/src/plugins/vcalendar/libical/libical/Makefile.am
+++ b/src/plugins/vcalendar/libical/libical/Makefile.am
@@ -34,14 +34,6 @@ YFLAGS = -d -v -t -pical_yy
LFLAGS = -Pical_yy
LEX_OUTPUT_ROOT = lex.ical_yy
-INCLUDES = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(srcdir) \
- -I$(top_srcdir)/src/plugins/vcalendar/libical \
- -I$(top_srcdir)/src/plugins/vcalendar/libical/libical
-
libical_la_LDFLAGS = -version-info 0:0:0
libical_la_SOURCES = \
@@ -225,4 +217,11 @@ EXTRA_DIST = \
icallexer.c \
icalyacc.c
-AM_CPPFLAGS = -DNDEBUG $(GLIB_CFLAGS)
+libical_la_CPPFLAGS = -DNDEBUG $(GLIB_CFLAGS) \
+ -I$(top_builddir) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(srcdir) \
+ -I$(top_srcdir)/src/plugins/vcalendar/libical \
+ -I$(top_srcdir)/src/plugins/vcalendar/libical/libical
+
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 5 +++--
src/common/Makefile.am | 4 +---
src/etpan/Makefile.am | 6 ++---
src/plugins/acpi_notifier/Makefile.am | 7 +++---
src/plugins/address_keeper/Makefile.am | 17 +++++++-------
src/plugins/archive/Makefile.am | 11 +++++----
src/plugins/att_remover/Makefile.am | 17 +++++++-------
src/plugins/attachwarner/Makefile.am | 17 +++++++-------
src/plugins/bogofilter/Makefile.am | 6 ++---
src/plugins/bsfilter/Makefile.am | 17 +++++++-------
src/plugins/clamd/Makefile.am | 6 ++---
src/plugins/clamd/libclamd/Makefile.am | 25 +++++++++++----------
src/plugins/demo/Makefile.am | 7 +++---
src/plugins/fancy/Makefile.am | 17 +++++++-------
src/plugins/fetchinfo/Makefile.am | 15 +++++++------
src/plugins/gdata/Makefile.am | 7 ++----
src/plugins/geolocation/Makefile.am | 7 ++----
src/plugins/libravatar/Makefile.am | 17 +++++++-------
src/plugins/mailmbox/Makefile.am | 21 ++++++++---------
src/plugins/newmail/Makefile.am | 10 ++++-----
src/plugins/notification/Makefile.am | 18 +++++++--------
src/plugins/notification/gtkhotkey/Makefile.am | 4 +++-
src/plugins/pdf_viewer/Makefile.am | 6 ++---
src/plugins/perl/Makefile.am | 12 +++++-----
src/plugins/pgpcore/Makefile.am | 17 +++++++-------
src/plugins/pgpinline/Makefile.am | 16 ++++++-------
src/plugins/pgpmime/Makefile.am | 17 +++++++-------
src/plugins/python/Makefile.am | 7 +++---
src/plugins/rssyl/Makefile.am | 17 +++++++-------
src/plugins/smime/Makefile.am | 16 ++++++-------
src/plugins/spam_report/Makefile.am | 17 +++++++-------
src/plugins/spamassassin/Makefile.am | 6 ++---
src/plugins/tnef_parse/Makefile.am | 7 +++---
src/plugins/vcalendar/Makefile.am | 19 ++++++++--------
src/plugins/vcalendar/libical/libical/Makefile.am | 17 +++++++-------
35 files changed, 211 insertions(+), 224 deletions(-)
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list