aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--addressbook/ChangeLog28
-rw-r--r--addressbook/backend/ebook/e-book-view.h4
-rw-r--r--addressbook/backend/ebook/e-book.h8
-rw-r--r--addressbook/backend/ebook/e-card-cursor.h4
-rw-r--r--addressbook/backend/ebook/e-card-simple.h4
-rw-r--r--addressbook/backend/ebook/e-card.h2
-rw-r--r--addressbook/backend/ebook/e-destination.h4
-rw-r--r--addressbook/conduit/Makefile.am1
-rw-r--r--addressbook/gui/contact-editor/Makefile.am1
-rw-r--r--addressbook/gui/contact-list-editor/Makefile.am1
-rw-r--r--addressbook/gui/merging/Makefile.am3
-rw-r--r--addressbook/gui/merging/e-card-merging.c2
-rw-r--r--addressbook/gui/widgets/Makefile.am1
-rw-r--r--addressbook/printing/Makefile.am2
-rw-r--r--calendar/ChangeLog16
-rw-r--r--calendar/gui/Makefile.am4
-rw-r--r--calendar/gui/dialogs/Makefile.am4
-rw-r--r--calendar/gui/dialogs/comp-editor-util.c2
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.c2
-rw-r--r--calendar/gui/e-meeting-model.c12
-rw-r--r--composer/ChangeLog4
-rw-r--r--composer/Makefile.am4
-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
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/Makefile.am2
-rw-r--r--tools/Makefile.am2
30 files changed, 111 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index f42b7b8072..58376eeea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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".
+
2002-07-09 <jpr@ximian.com>
* configure.in: re-order nss and nspr flags
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 940c672bde..e4801b9209 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,31 @@
+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
+
+ * conduit/Makefile.am (INCLUDES): Same.
+
+ * 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.
+
2002-07-10 Ettore Perazzoli <ettore@ximian.com>
* gui/component/addressbook-storage.c (load_source_data): Pass
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
index 86326ca5b7..e1dc211c91 100644
--- a/addressbook/backend/ebook/e-book-view.h
+++ b/addressbook/backend/ebook/e-book-view.h
@@ -13,8 +13,8 @@
#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-book-view-listener.h>
+#include <ebook/e-card.h>
+#include <ebook/e-book-view-listener.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
index b1549f4f8e..e917279775 100644
--- a/addressbook/backend/ebook/e-book.h
+++ b/addressbook/backend/ebook/e-book.h
@@ -13,10 +13,10 @@
#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-cursor.h>
-#include <addressbook/backend/ebook/e-book-view.h>
-#include <addressbook/backend/ebook/e-book-types.h>
+#include <ebook/e-card.h>
+#include <ebook/e-card-cursor.h>
+#include <ebook/e-book-view.h>
+#include <ebook/e-book-types.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index e042268635..d6e7625941 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -12,8 +12,8 @@
#include <gtk/gtkobject.h>
#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/addressbook.h>
-#include <addressbook/backend/ebook/e-card.h>
+#include <ebook/addressbook.h>
+#include <ebook/e-card.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
index f0a5b2d613..53c1d13164 100644
--- a/addressbook/backend/ebook/e-card-simple.h
+++ b/addressbook/backend/ebook/e-card-simple.h
@@ -15,8 +15,8 @@
#include <time.h>
#include <gtk/gtk.h>
#include <stdio.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-types.h>
+#include <ebook/e-card.h>
+#include <ebook/e-card-types.h>
#include <e-util/e-list.h>
#define E_TYPE_CARD_SIMPLE (e_card_simple_get_type ())
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index 23876bd63a..e9b3701149 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -15,7 +15,7 @@
#include <time.h>
#include <gtk/gtkobject.h>
#include <stdio.h>
-#include <addressbook/backend/ebook/e-card-types.h>
+#include <ebook/e-card-types.h>
#include <e-util/e-list.h>
#define E_TYPE_CARD (e_card_get_type ())
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
index f545794ab0..42dc97800e 100644
--- a/addressbook/backend/ebook/e-destination.h
+++ b/addressbook/backend/ebook/e-destination.h
@@ -28,8 +28,8 @@
#define __E_DESTINATION_H__
#include <gtk/gtkobject.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-book.h>
+#include <ebook/e-card.h>
+#include <ebook/e-book.h>
#include <gnome-xml/tree.h>
#define E_TYPE_DESTINATION (e_destination_get_type ())
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 86be3b2fed..fa49a595e6 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook \
-I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(PISOCK_CFLAGS) \
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index c6dd88415d..8f8cb4c4f9 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/widgets/e-table \
-I$(top_builddir)/shell \
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index f710729826..34aea3a678 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/addressbook/gui/contact-editor \
-I$(top_builddir)/shell \
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 7df0ac4fcc..a063f17819 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -3,7 +3,8 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-I$(top_srcdir) \
- -I$(top_srcdir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \
diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c
index b9aacabde7..14ed261405 100644
--- a/addressbook/gui/merging/e-card-merging.c
+++ b/addressbook/gui/merging/e-card-merging.c
@@ -12,7 +12,7 @@
#include "e-card-merging.h"
#include <libgnomeui/gnome-dialog.h>
-#include "e-card-compare.h"
+#include <ebook/e-card-compare.h>
#include <glade/glade.h>
#include <gtk/gtksignal.h>
#include "addressbook/gui/widgets/e-minicard-widget.h"
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index fe1b29d7c6..647410a922 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = \
-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/gui/contact-editor \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/addressbook/gui/component \
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index bd532b86cc..015069e51b 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -14,6 +14,8 @@ INCLUDES = \
$(GNOME_INCLUDEDIR) \
-DG_LOG_DOMAIN=\"addressbook-printing\" \
-I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a1a505e0c6..f42e1d9552 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,19 @@
+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.
+
2002-07-02 Rodrigo Moya <rodrigo@ximian.com>
Fixes #16034
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 9c842635f7..28d8e02aeb 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -45,8 +45,8 @@ INCLUDES = \
-I$(top_builddir)/calendar/cal-client \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
- -I$(top_srcdir)/addressbook/backend/ebook \
- -I$(top_builddir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/widgets \
-I$(includedir) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index aa107d84e0..5108fc8b2c 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -22,8 +22,8 @@ INCLUDES = \
-I$(top_builddir)/libical/src/libical \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
- -I$(top_srcdir)/addressbook/backend/ebook \
- -I$(top_builddir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(includedir) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 34d4e71e81..5d414a640c 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -32,7 +32,7 @@
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-widget.h>
#include <gal/unicode/gunicode.h>
-#include <e-destination.h>
+#include <ebook/e-destination.h>
#include <e-util/e-time-utils.h>
#include <cal-util/timeutil.h>
#include "../calendar-config.h"
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 159d27e6a3..d37fbce51c 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -32,7 +32,7 @@
#include <ical.h>
#include <glade/glade.h>
#include <widgets/misc/e-map.h>
-#include <e-destination.h>
+#include <ebook/e-destination.h>
#include "Evolution-Addressbook-SelectNames.h"
#include "e-delegate-dialog.h"
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
index 7f1479f452..50a0e4f49a 100644
--- a/calendar/gui/e-meeting-model.c
+++ b/calendar/gui/e-meeting-model.c
@@ -38,12 +38,12 @@
#include <gal/e-table/e-cell-popup.h>
#include <gal/e-table/e-cell-combo.h>
#include <gal/util/e-unicode-i18n.h>
-#include <e-book.h>
-#include <e-card-types.h>
-#include <e-card-cursor.h>
-#include <e-card.h>
-#include <e-card-simple.h>
-#include <e-destination.h>
+#include <ebook/e-book.h>
+#include <ebook/e-card-types.h>
+#include <ebook/e-card-cursor.h>
+#include <ebook/e-card.h>
+#include <ebook/e-card-simple.h>
+#include <ebook/e-destination.h>
#include <cal-util/cal-component.h>
#include <cal-util/cal-util.h>
#include <cal-util/timeutil.h>
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 9c0e73c008..8991bf8137 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-08 Peter Williams <peterw@ximian.com>
+
+ * Makefile.am (INCLUDES): Fix cflags for ebook header namespacing.
+
2002-07-05 Jeffrey Stedfast <fejj@ximian.com>
* evolution-composer.c (init): Don't connect to the postpone
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 0b9f4a2f7b..16836ccf59 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -48,8 +48,8 @@ INCLUDES = \
-I$(top_builddir)/widgets \
-I$(top_srcdir)/camel \
-I$(top_builddir)/camel \
- -I$(top_srcdir)/addressbook/backend/ebook \
- -I$(top_builddir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_builddir)/addressbook/gui/component/select-names \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
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"
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 86b97c2f8d..ff9f00b287 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-08 Peter Williams <peterw@ximian.com>
+
+ * Makefile.am (INCLUDES): Add -I flags to get the ebook headers.
+
2002-07-10 Ettore Perazzoli <ettore@ximian.com>
* subscribe-dialog.c (recursive_add_folder): Pass zero as
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 7bc4d8b498..fa16a075f3 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -16,6 +16,8 @@ INCLUDES = \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/shell/importer \
-I$(top_builddir)/shell/importer \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(EVOLUTION_MAIL_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ae49e7c927..a2de0296a6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,6 +17,8 @@ INCLUDES = \
-DEVOLUTION_BINDIR=\""$(bindir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(GNOME_FULL_CFLAGS)
EXTRA_DIST = $(bin_SCRIPTS) verify-evolution-install.sh \