Do not put enchant's CFLAGS into main CFLAGS make variable.
authorAndrej Kacian <ticho@claws-mail.org>
Fri, 9 Feb 2018 19:21:41 +0000 (20:21 +0100)
committerAndrej Kacian <ticho@claws-mail.org>
Fri, 9 Feb 2018 19:21:41 +0000 (20:21 +0100)
Handle its CFLAGS just like all other libraries'.

18 files changed:
configure.ac
src/plugins/address_keeper/Makefile.am
src/plugins/att_remover/Makefile.am
src/plugins/attachwarner/Makefile.am
src/plugins/bsfilter/Makefile.am
src/plugins/clamd/Makefile.am
src/plugins/dillo/Makefile.am
src/plugins/fancy/Makefile.am
src/plugins/libravatar/Makefile.am
src/plugins/mailmbox/Makefile.am
src/plugins/managesieve/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/rssyl/Makefile.am
src/plugins/spam_report/Makefile.am
src/plugins/vcalendar/Makefile.am

index ba7e489..87c95e5 100644 (file)
@@ -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"
index 56e7965..4a49ae1 100644 (file)
@@ -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 \
index 99bfc6f..543b5bc 100644 (file)
@@ -74,4 +74,5 @@ att_remover_la_DEPENDENCIES = $(plugin_deps)
 att_remover_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS)
+       $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS)
index 826279e..146180b 100644 (file)
@@ -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 \
index a39eb05..0b92019 100644 (file)
@@ -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 \
index 72bb101..8099afb 100644 (file)
@@ -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)
index 9f8f42a..d3453c5 100644 (file)
@@ -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)
index 4c684b3..519b885 100644 (file)
@@ -81,6 +81,7 @@ fancy_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
        $(WEBKIT_CFLAGS) \
        $(LIBSOUP_GNOME_CFLAGS) \
        $(CURL_CFLAGS)
index 4fcc57c..ac0f35c 100644 (file)
@@ -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 \
index a0e662c..62acb27 100644 (file)
@@ -86,4 +86,5 @@ mailmbox_la_LIBADD = \
 mailmbox_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS)
+       $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS)
index 2155c44..8a9da5d 100644 (file)
@@ -73,6 +73,7 @@ managesieve_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
        $(CURL_CFLAGS)
 
 managesieve_la_SOURCES = \
index 1ce0e2c..41800a7 100644 (file)
@@ -102,6 +102,7 @@ notification_la_CPPFLAGS = \
        $(NOTIFY_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
        $(libnotify_CFLAGS) \
        $(unity_CFLAGS) \
        $(libcanberra_gtk_CFLAGS)
index 5da7c41..25cabc5 100644 (file)
@@ -25,4 +25,5 @@ pdf_viewer_la_CPPFLAGS = \
        -I$(top_srcdir)/src/gtk \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
        $(POPPLER_CFLAGS)
index 2785e3f..31f162e 100644 (file)
@@ -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
index ebb9d72..d8da14a 100644 (file)
@@ -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)\"" \
index 12b663a..6106f39 100644 (file)
@@ -76,6 +76,7 @@ rssyl_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
        $(CURL_CFLAGS) \
        $(EXPAT_CFLAGS)
 
index 15323d3..43ba72e 100644 (file)
@@ -78,4 +78,5 @@ spamreport_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \
        $(CURL_CFLAGS) \
-       $(GTK_CFLAGS)
+       $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS)
index ceb18d1..a44367e 100644 (file)
@@ -89,6 +89,7 @@ vcalendar_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
        $(CURL_CFLAGS) \
   $(LIBICAL_CFLAGS)