Made Evolution OAF-compatible.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index e6d7a08..65aef6c 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
+
+       * providers/pop3/Makefile.am (INCLUDES): Add `-I$(srcdir)/../../..'
+       to pick the Camel includes.
+       * providers/sendmail/Makefile.am (INCLUDES): Likewise.
+
+       * camel.h: Don't #include <camel/data-wrapper-repository.h> anymore.
+
 2000-04-27  NotZed  <NotZed@HelixCode.com>
 
        * camel-mime-utils.c (check_header): Dont try and check a NULL

diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index c587983..202320b 100644 (file)
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -8,9 +8,14 @@ providerdir = $(pkglibdir)/camel-providers/$(VERSION)
 
 provider_LTLIBRARIES = libcamelpop3.la
 
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
+INCLUDES =                                     \
+       -I..                                    \
+       -I$(srcdir)/..                          \
+       -I$(srcdir)/../../..                    \
+        -I$(includedir)                                \
        -I$(top_srcdir)/intl                    \
-       $(GTK_INCLUDEDIR) -I$(top_srcdir)/camel \
+       $(GTK_INCLUDEDIR)                       \
+       -I$(top_srcdir)/camel                   \
        -I$(srcdir)/../mbox
 
 libcamelpop3_la_SOURCES =                      \

diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index aada24a..9c9c3f3 100644 (file)
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -9,7 +9,11 @@ providerdir = $(pkglibdir)/camel-providers/$(VERSION)
 
 provider_LTLIBRARIES = libcamelsendmail.la
 
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
+INCLUDES =                                     \
+       -I..                                    \
+       -I$(srcdir)/..                          \
+       -I$(srcdir)/../../..                    \
+       -I$(includedir)                         \
        -I$(top_srcdir)/intl                    \
        $(GTK_INCLUDEDIR) -I$(top_srcdir)/camel
 

diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index 25ee71b..dee3a50 100644 (file)
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -8,9 +8,14 @@ providerdir = $(pkglibdir)/camel-providers/$(VERSION)
 
 provider_LTLIBRARIES = libcamelsmtp.la
 
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
+INCLUDES =                                     \
+       -I..                                    \
+       -I$(srcdir)/..                          \
+       -I$(srcdir)/../../..                    \
+       -I$(includedir)                         \
        -I$(top_srcdir)/intl                    \
-       $(GTK_INCLUDEDIR) -I$(top_srcdir)/camel
+       $(GTK_INCLUDEDIR)                       \
+       -I$(top_srcdir)/camel
 
 libcamelsmtp_la_SOURCES =                      \
        camel-smtp-provider.c                   \