aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-07-14 22:06:34 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-07-14 22:07:12 +0800
commit1f89bf6b80c82ce7aaee9b54ba860173ac325e56 (patch)
tree3f6dbd48277412bd5facd16be121b8384e81d462
parentc9f4659cd74347bbb27ca2f8f9b8cf1e406aa52e (diff)
downloadgsoc2013-evolution-1f89bf6b80c82ce7aaee9b54ba860173ac325e56.tar
gsoc2013-evolution-1f89bf6b80c82ce7aaee9b54ba860173ac325e56.tar.gz
gsoc2013-evolution-1f89bf6b80c82ce7aaee9b54ba860173ac325e56.tar.bz2
gsoc2013-evolution-1f89bf6b80c82ce7aaee9b54ba860173ac325e56.tar.lz
gsoc2013-evolution-1f89bf6b80c82ce7aaee9b54ba860173ac325e56.tar.xz
gsoc2013-evolution-1f89bf6b80c82ce7aaee9b54ba860173ac325e56.tar.zst
gsoc2013-evolution-1f89bf6b80c82ce7aaee9b54ba860173ac325e56.zip
Fix some build issues.
-rw-r--r--em-format/Makefile.am1
-rw-r--r--plugins/mark-all-read/Makefile.am3
-rw-r--r--plugins/plugin-manager/Makefile.am1
-rw-r--r--plugins/startup-wizard/Makefile.am5
-rw-r--r--smclient/Makefile.am1
-rw-r--r--smime/gui/Makefile.am4
-rw-r--r--smime/gui/certificate-manager.c6
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 <pkcs11.h>
#include <pk11func.h>
-#include <e-shell.h>
-#include <e-preferences-window.h>
-#include <e-util/e-util-private.h>
+#include "shell/e-shell.h"
+#include "e-util/e-util-private.h"
+#include "widgets/misc/e-preferences-window.h"
typedef struct {
GladeXML *gui;