commit 09301b6e73e4af1b03b6f19d340dd909cf527bcc
parent 5ab9e6e799f34e73d648817a295051a8da981837
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Fri, 9 Feb 2018 20:21:41 +0100
Do not put enchant's CFLAGS into main CFLAGS make variable.
Handle its CFLAGS just like all other libraries'.
Diffstat:
18 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -594,7 +594,6 @@ if test $enable_enchant = yes; then
AC_DEFINE(USE_ENCHANT, 1, enchant)
echo "Building with enchant"
enable_enchant=yes
- CFLAGS="$CFLAGS `$PKG_CONFIG --cflags enchant`"
],
[
echo "Building without enchant-notification"
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
@@ -71,7 +71,8 @@ address_keeper_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
address_keeper_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
address_keeper_la_SOURCES = \
address_keeper.c address_keeper.h \
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
@@ -74,4 +74,5 @@ att_remover_la_DEPENDENCIES = $(plugin_deps)
att_remover_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
@@ -71,7 +71,8 @@ attachwarner_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
attachwarner_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
attachwarner_la_SOURCES = \
attachwarner.c attachwarner.h \
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
@@ -71,7 +71,8 @@ bsfilter_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
bsfilter_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
bsfilter_la_SOURCES = \
bsfilter.c bsfilter.h \
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
@@ -30,4 +30,5 @@ clamd_la_CPPFLAGS = \
-I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
diff --git a/src/plugins/dillo/Makefile.am b/src/plugins/dillo/Makefile.am
@@ -32,4 +32,5 @@ dillo_la_CPPFLAGS = \
-I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
@@ -81,6 +81,7 @@ fancy_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(WEBKIT_CFLAGS) \
$(LIBSOUP_GNOME_CFLAGS) \
$(CURL_CFLAGS)
diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
@@ -73,7 +73,8 @@ libravatar_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(CURL_CFLAGS)
+ $(CURL_CFLAGS) \
+ $(ENCHANT_CFLAGS)
libravatar_la_SOURCES = \
libravatar.c libravatar.h \
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
@@ -86,4 +86,5 @@ mailmbox_la_LIBADD = \
mailmbox_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
diff --git a/src/plugins/managesieve/Makefile.am b/src/plugins/managesieve/Makefile.am
@@ -73,6 +73,7 @@ managesieve_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(CURL_CFLAGS)
managesieve_la_SOURCES = \
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
@@ -102,6 +102,7 @@ notification_la_CPPFLAGS = \
$(NOTIFY_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(libnotify_CFLAGS) \
$(unity_CFLAGS) \
$(libcanberra_gtk_CFLAGS)
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
@@ -25,4 +25,5 @@ pdf_viewer_la_CPPFLAGS = \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(POPPLER_CFLAGS)
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
@@ -29,6 +29,7 @@ perl_la_CPPFLAGS = \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(PERL_CFLAGS)
EXTRA_DIST = cm_perl.pod
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
@@ -49,6 +49,7 @@ python_la_CPPFLAGS = \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(PYTHON_CFLAGS) \
$(PYGTK_CFLAGS) \
-DPYTHON_SHARED_LIB="\"$(PYTHON_SHARED_LIB)\"" \
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
@@ -76,6 +76,7 @@ rssyl_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(CURL_CFLAGS) \
$(EXPAT_CFLAGS)
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
@@ -78,4 +78,5 @@ spamreport_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(CURL_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS)
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
@@ -89,6 +89,7 @@ vcalendar_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(CURL_CFLAGS) \
$(LIBICAL_CFLAGS)
