[Commits] [SCM] claws branch, master, updated. 3.9.2-7-g4b26133
claws at claws-mail.org
claws at claws-mail.org
Tue Jun 11 15:51:07 CEST 2013
The branch master of project "claws" (Claws Mail) has been updated
via 4b26133c3c0b70067d86763e80b1d7b71703e41a (commit)
from 177c7487c4b46d1106b1efbda9eea5ac57158a88 (commit)
- Log -----------------------------------------------------------------
commit 4b26133c3c0b70067d86763e80b1d7b71703e41a
Author: Paul <paul at claws-mail.org>
Date: Tue Jun 11 14:50:59 2013 +0100
clean up former extra-plugins Makefiles
diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index 7546b95..df1d5df 100644
--- a/src/plugins/acpi_notifier/Makefile.am
+++ b/src/plugins/acpi_notifier/Makefile.am
@@ -20,7 +20,5 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index df1df8f..48acae0 100644
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -64,11 +64,8 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
address_keeper_la_SOURCES = \
address_keeper.c address_keeper.h \
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index 83da4d1..ff8cfb7 100644
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -31,7 +31,5 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 8369a68..1ffecd8 100644
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -61,7 +61,6 @@ att_remover_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
att_remover_la_DEPENDENCIES = $(plugin_deps)
AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index d570fd0..d40ebc4 100644
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -64,11 +64,8 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
attachwarner_la_SOURCES = \
attachwarner.c attachwarner.h \
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index b3390de..b6f17c1 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -64,11 +64,8 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
bsfilter_la_SOURCES = \
bsfilter.c bsfilter.h \
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 917ec3f..9ff0438 100644
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -26,8 +26,5 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index 2864cf6..a55dd05 100644
--- a/src/plugins/gdata/Makefile.am
+++ b/src/plugins/gdata/Makefile.am
@@ -25,9 +25,6 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(GDATA_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GDATA_CFLAGS)
diff --git a/src/plugins/geolocation/Makefile.am b/src/plugins/geolocation/Makefile.am
index 1c1ae46..f3b98ab 100644
--- a/src/plugins/geolocation/Makefile.am
+++ b/src/plugins/geolocation/Makefile.am
@@ -22,10 +22,7 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS) \
- $(CHAMPLAIN_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(CHAMPLAIN_CFLAGS)
\ No newline at end of file
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 9c63b0b..4fcaa58 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -73,12 +73,10 @@ mailmbox_la_LIBADD = \
$(GTK_LIBS)
mailmbox_la_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am
index 2d16a1c..734966b 100644
--- a/src/plugins/newmail/Makefile.am
+++ b/src/plugins/newmail/Makefile.am
@@ -11,8 +11,7 @@ newmail_la_LDFLAGS = \
-avoid-version -module
AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
- $(GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(GTK_CFLAGS)
INCLUDES = \
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index b987616..7808661 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -96,10 +96,8 @@ notification_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
notification_la_CPPFLAGS = \
$(NOTIFY_CFLAGS) \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\" \
$(libnotify_CFLAGS) \
$(libindicate_CFLAGS) \
$(libcanberra_gtk_CFLAGS)
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 57729f7..46c4e5d 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -20,9 +20,6 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(POPPLER_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(POPPLER_CFLAGS)
\ No newline at end of file
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 6924e68..6fd4ba5 100644
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -18,7 +18,6 @@ perl_la_LIBADD = \
$(GTK_LIBS)
AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(PERL_CFLAGS)
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index daef423..bee41ec 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -37,13 +37,10 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(PYTHON_CFLAGS) \
$(PYGTK_CFLAGS) \
-DPYTHON_SHARED_LIB="\"$(PYTHON_SHARED_LIB)\"" \
-DENABLE_PYTHON \
- -fno-strict-aliasing \
- -DLOCALEDIR=\""$(localedir)"\"
+ -fno-strict-aliasing
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 2ed7643..50605c3 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -64,13 +64,10 @@ rssyl_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) $(LIBXML_LIBS) $(CURL_LIBS)
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(CURL_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(CURL_CFLAGS)
rssyl_la_SOURCES = \
date.c date.h \
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index e4271d9..21f3994 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -70,9 +70,6 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(CURL_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index fd9da13..941eaff 100644
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -79,8 +79,5 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
AM_CPPFLAGS = \
- -Wall \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(GTK_CFLAGS)
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index 0e6aeb3..022efab 100644
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -84,11 +84,9 @@ vcalendar_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(top_builddir)/src/plugins/vcalendar/libical/libical/libical.la
AM_CPPFLAGS = \
- $(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(CURL_CFLAGS) \
- -DLOCALEDIR=\""$(localedir)"\"
+ $(CURL_CFLAGS)
clean-local:
rm -f libclaws.a
-----------------------------------------------------------------------
Summary of changes:
src/plugins/acpi_notifier/Makefile.am | 4 +---
src/plugins/address_keeper/Makefile.am | 5 +----
src/plugins/archive/Makefile.am | 4 +---
src/plugins/att_remover/Makefile.am | 1 -
src/plugins/attachwarner/Makefile.am | 5 +----
src/plugins/bsfilter/Makefile.am | 5 +----
src/plugins/clamd/Makefile.am | 5 +----
src/plugins/gdata/Makefile.am | 5 +----
src/plugins/geolocation/Makefile.am | 5 +----
src/plugins/mailmbox/Makefile.am | 2 --
src/plugins/newmail/Makefile.am | 3 +--
src/plugins/notification/Makefile.am | 2 --
src/plugins/pdf_viewer/Makefile.am | 5 +----
src/plugins/perl/Makefile.am | 1 -
src/plugins/python/Makefile.am | 5 +----
src/plugins/rssyl/Makefile.am | 5 +----
src/plugins/spam_report/Makefile.am | 5 +----
src/plugins/tnef_parse/Makefile.am | 5 +----
src/plugins/vcalendar/Makefile.am | 4 +---
19 files changed, 15 insertions(+), 61 deletions(-)
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list