From 1f89bf6b80c82ce7aaee9b54ba860173ac325e56 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Jul 2009 10:06:34 -0400 Subject: Fix some build issues. --- em-format/Makefile.am | 1 + plugins/mark-all-read/Makefile.am | 3 ++- plugins/plugin-manager/Makefile.am | 1 + plugins/startup-wizard/Makefile.am | 5 +++-- smclient/Makefile.am | 1 - smime/gui/Makefile.am | 4 ++-- smime/gui/certificate-manager.c | 6 +++--- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/em-format/Makefile.am b/em-format/Makefile.am index 360ceac7c2..953364482f 100644 --- a/em-format/Makefile.am +++ b/em-format/Makefile.am @@ -2,6 +2,7 @@ emformatincludedir = $(privincludedir)/em-format AM_CPPFLAGS = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) privsolib_LTLIBRARIES = libemformat.la diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index c44c5dc0cb..aac01d2b37 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)\ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am index bd284c659c..5f1228f439 100644 --- a/plugins/plugin-manager/Makefile.am +++ b/plugins/plugin-manager/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am index 5dec1f86a5..04de4e4e2d 100644 --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -1,5 +1,6 @@ -AM_CPPFLAGS = -I . \ - -I$(top_srcdir) \ +AM_CPPFLAGS = -I . \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/smclient/Makefile.am b/smclient/Makefile.am index 53cb8f684f..4d5c63f0fc 100644 --- a/smclient/Makefile.am +++ b/smclient/Makefile.am @@ -38,7 +38,6 @@ libeggdesktopfile_la_SOURCES = \ eggdesktopfile.h EXTRA_DIST = \ - eggsmclient-osx.c \ eggsmclient-win32.c \ eggsmclient-xsmp.c diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index 092928bf2c..a6a595ea93 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -6,8 +6,8 @@ AM_CPPFLAGS = \ -I$(top_builddir)/smime/lib \ -I$(top_srcdir)/shell \ -I$(top_builddir)/shell \ - -I$(top_srcdir)/widgets/misc \ - -I$(top_builddir)/widgets/misc \ + -I$(top_srcdir)/widgets \ + -I$(top_builddir)/widgets \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index ed49bfbe67..6e09b504fd 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -48,9 +48,9 @@ #include #include -#include -#include -#include +#include "shell/e-shell.h" +#include "e-util/e-util-private.h" +#include "widgets/misc/e-preferences-window.h" typedef struct { GladeXML *gui; -- cgit