commit 4bed28b4a0d0e71e74b53b2c443683a2b2bc5d38
parent f2f20fc45d81f91fbcab14e79d69d509ada694b2
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Fri, 24 Aug 2018 14:09:12 +0200
Fix various plugins including generated .h files when building outside of source dir.
Diffstat:
16 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
@@ -30,7 +30,7 @@ archive_la_LIBADD = \
archive_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
@@ -27,7 +27,7 @@ bogofilter_la_LIBADD = $(cygwin_export_lib) \
bogofilter_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(ENCHANT_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
@@ -8,7 +8,7 @@ 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_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
@@ -27,7 +27,7 @@ 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_builddir)/src \
-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
@@ -8,9 +8,10 @@ libclamd_plugin_la_CPPFLAGS = \
$(GTK_CFLAGS) \
-I$(top_srcdir) \
-I$(top_builddir) \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/gtk
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_srcdir)/src/gtk
if BUILD_CLAMD_PLUGIN
noinst_LTLIBRARIES = libclamd-plugin.la
diff --git a/src/plugins/dillo/Makefile.am b/src/plugins/dillo/Makefile.am
@@ -28,7 +28,7 @@ dillo_la_LIBADD = $(cygwin_export_lib) \
dillo_la_CPPFLAGS = \
-I$(top_srcdir)/src \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
@@ -8,7 +8,7 @@ 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_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
@@ -25,8 +25,8 @@
#include <glib.h>
#include <glib/gi18n.h>
+#include "common/version.h"
#include "defs.h"
-#include "version.h"
#include "claws.h"
#include "plugin.h"
#include "gtkutils.h"
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
@@ -8,7 +8,7 @@ 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_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
@@ -19,7 +19,7 @@ IFLAGS = \
-I$(top_srcdir)/src/plugins/notification/gtkhotkey \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
@@ -25,7 +25,7 @@ perl_la_LIBADD = \
perl_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
@@ -45,7 +45,7 @@ python_la_LDFLAGS = \
python_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
@@ -10,7 +10,7 @@ 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_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
@@ -8,7 +8,7 @@ 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_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
@@ -30,7 +30,7 @@ spamassassin_la_LIBADD = $(cygwin_export_lib) \
spamassassin_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(ENCHANT_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
@@ -71,7 +71,7 @@ tnef_parse_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
tnef_parse_la_CPPFLAGS = \
