aboutsummaryrefslogtreecommitdiffstats
path: root/smime/lib
diff options
context:
space:
mode:
Diffstat (limited to 'smime/lib')
-rw-r--r--smime/lib/Makefile.am5
-rw-r--r--smime/lib/e-cert-db.c4
-rw-r--r--smime/lib/e-pkcs12.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 5ef47070d4..ed052bfca9 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -14,6 +14,8 @@ libessmime_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
+ $(CHAMPLAIN_CFLAGS) \
+ $(GTKHTML_CFLAGS) \
$(CERT_UI_CFLAGS)
libessmime_la_SOURCES = \
@@ -29,10 +31,11 @@ libessmime_la_SOURCES = \
e-pkcs12.h
libessmime_la_LIBADD = \
- $(top_builddir)/libemail-utils/libemail-utils.la \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
+ $(CHAMPLAIN_LIBS) \
+ $(GTKHTML_LIBS) \
$(CERT_UI_LIBS)
libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index a98d085c43..1a5803fda1 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -48,9 +48,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <camel/camel.h> /* FIXME: this is where camel_init is defined; it shouldn't include everything else */
-
-#include <libedataserverui/libedataserverui.h>
+#include <camel/camel.h>
/* private NSS defines used by PSM */
/* (must be declated before cert.h) */
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index fa61033151..eef6acd32f 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -51,7 +51,7 @@
#include <fcntl.h>
#include <unistd.h>
-#include <libedataserverui/libedataserverui.h>
+#include "e-util/e-util.h"
#include "e-cert-db.h"
#include "e-pkcs12.h"