diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 28 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-view.h | 4 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book.h | 8 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card-cursor.h | 4 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card-simple.h | 4 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card.h | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-destination.h | 4 | ||||
| -rw-r--r-- | addressbook/conduit/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/merging/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/merging/e-card-merging.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/printing/Makefile.am | 2 |
14 files changed, 50 insertions, 15 deletions
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)"\" \ |