aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/backend/ebook/Makefile.am4
-rw-r--r--addressbook/backend/ebook/evolution-gnomecard-importer.c4
3 files changed, 10 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6aafed1610..45873b7cb4 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-13 Iain Holmes <iain@ximian.com>
+
+ * backend/ebook/Makefile.am: Change the importer includes around a bit.
+
+ * backend/ebook/evolution-gnomecard-importer.c: Correctly add the includes.
+
2001-03-09 JP Rosevear <jpr@ximian.com>
* conduit/Makefile.am: PISOCK_INCLUDEDIR has become
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index fbba0c98d0..7abee848e9 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -30,8 +30,8 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/ename \
-I$(top_builddir)/addressbook/backend \
-I$(top_builddir)/addressbook/ename \
- -I$(top_builddir)/shell/importer \
- -I$(top_srcdir)/shell/importer \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS)
diff --git a/addressbook/backend/ebook/evolution-gnomecard-importer.c b/addressbook/backend/ebook/evolution-gnomecard-importer.c
index aac268e09d..508f1fe16a 100644
--- a/addressbook/backend/ebook/evolution-gnomecard-importer.c
+++ b/addressbook/backend/ebook/evolution-gnomecard-importer.c
@@ -7,8 +7,8 @@
#include <e-book.h>
-#include <evolution-importer.h>
-#include <GNOME_Evolution_Importer.h>
+#include <importer/evolution-importer.h>
+#include <importer/GNOME_Evolution_Importer.h>
#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_GnomeCard_ImporterFactory"