aboutsummaryrefslogtreecommitdiffstats
path: root/importers
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2002-07-11 05:34:37 +0800
committerPeter Williams <peterw@src.gnome.org>2002-07-11 05:34:37 +0800
commit9e759ac6e1fb3d3c363e7a91bafb643e17cc87db (patch)
tree47ccf7d87b6a46fc01b93f24adc465a289ffad21 /importers
parent93248701c8dec093723f78b809a857b0a4183e5c (diff)
downloadgsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.tar
gsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.tar.gz
gsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.tar.bz2
gsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.tar.lz
gsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.tar.xz
gsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.tar.zst
gsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.zip
Add include lines to get ebook headers relative to <ebook/foo.h>, not
2002-07-09 Peter Williams <peterw@ximian.com> * tools/Makefile.am (INCLUDES): Add include lines to get ebook headers relative to <ebook/foo.h>, not "foo.h". addressbook: 2002-07-08 Peter Williams <peterw@ximian.com> * backend/ebook/e-book.h: Normalize includes to <ebook/foo.h>, so that the installed headers will work sanely. * backend/ebook/e-card-cursor.h: * backend/ebook/e-book-view.h: * backend/ebook/e-card-simple.h: * backend/ebook/e-card.h: * backend/ebook/e-destination.h: Same. * printing/Makefile.am (INCLUDES): add -Iaddressbook/backend to access the ebook headers. Also the builddir version to get the generated addressbook.h * gui/widgets/Makefile.am (INCLUDES): Same builddir fix. * gui/merging/e-card-merging.c: Fix an ebook #include. * gui/merging/Makefile.am (INCLUDES): Same idea. * gui/contact-list-editor/Makefile.am (INCLUDES): Same. * gui/contact-editor/Makefile.am (INCLUDES): Same builddir change. calendar: 2002-07-08 Peter Williams <peterw@ximian.com> * gui/Makefile.am (INCLUDES): Change the -I flags to get it to play nicely with the new Ebook header paradigm. * gui/dialogs/Makefile.am: Same. * gui/e-meeting-model.c: More of the same. * gui/dialogs/e-delegate-dialog.c: * gui/dialogs/e-meeting-model.c: * gui/dialogs/comp-editor-util.c: Fix include lines to get ebook headers. * pcs/Makefile.am: Same. composer: 2002-07-08 Peter Williams <peterw@ximian.com> * Makefile.am (INCLUDES): Fix cflags for ebook header namespacing. importers: 2002-07-08 Peter Williams <peterw@ximian.com> * Makefile.am: Fix cflags to get at ebook headers correctly. * pine-importer.c: Fix include lines to get ebook headers the "right" way. * evolution-gnomecard-importer.c: Same. mail: 2002-07-08 Peter Williams <peterw@ximian.com> * Makefile.am (INCLUDES): Add -I flags to get the ebook headers. svn path=/trunk/; revision=17411
Diffstat (limited to 'importers')
-rw-r--r--importers/ChangeLog9
-rw-r--r--importers/Makefile.am3
-rw-r--r--importers/evolution-gnomecard-importer.c2
-rw-r--r--importers/pine-importer.c4
4 files changed, 14 insertions, 4 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog
index c5c2b12994..edaf35c0ea 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-08 Peter Williams <peterw@ximian.com>
+
+ * Makefile.am: Fix cflags to get at ebook headers correctly.
+
+ * pine-importer.c: Fix include lines to get ebook headers the "right"
+ way.
+
+ * evolution-gnomecard-importer.c: Same.
+
2002-05-27 Iain Holmes <iain@ximian.com>
* netscape-importer.c: Apply patch from Christian to fix a typo.
diff --git a/importers/Makefile.am b/importers/Makefile.am
index 8ba389df41..3df473c6d4 100644
--- a/importers/Makefile.am
+++ b/importers/Makefile.am
@@ -10,7 +10,8 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
- -I$(top_srcdir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(IMPORTERS_CFLAGS)
IDLS = \
diff --git a/importers/evolution-gnomecard-importer.c b/importers/evolution-gnomecard-importer.c
index e910a10426..d4cc1244f6 100644
--- a/importers/evolution-gnomecard-importer.c
+++ b/importers/evolution-gnomecard-importer.c
@@ -34,7 +34,7 @@
#include <bonobo/bonobo-moniker-util.h>
#include <bonobo-conf/bonobo-config-database.h>
-#include <e-book.h>
+#include <ebook/e-book.h>
#include <importer/evolution-intelligent-importer.h>
#include <importer/GNOME_Evolution_Importer.h>
diff --git a/importers/pine-importer.c b/importers/pine-importer.c
index f2c812ddca..8ef539409d 100644
--- a/importers/pine-importer.c
+++ b/importers/pine-importer.c
@@ -48,8 +48,8 @@
#include <importer/evolution-importer-client.h>
#include <importer/GNOME_Evolution_Importer.h>
-#include <e-book.h>
-#include <e-card-simple.h>
+#include <ebook/e-book.h>
+#include <ebook/e-card-simple.h>
#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Pine_Intelligent_Importer_Factory"
#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer"