From 9e759ac6e1fb3d3c363e7a91bafb643e17cc87db Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Wed, 10 Jul 2002 21:34:37 +0000 Subject: Add include lines to get ebook headers relative to , not 2002-07-09 Peter Williams * tools/Makefile.am (INCLUDES): Add include lines to get ebook headers relative to , not "foo.h". addressbook: 2002-07-08 Peter Williams * backend/ebook/e-book.h: Normalize includes to , 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 * 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 * Makefile.am (INCLUDES): Fix cflags for ebook header namespacing. importers: 2002-07-08 Peter Williams * 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 * Makefile.am (INCLUDES): Add -I flags to get the ebook headers. svn path=/trunk/; revision=17411 --- calendar/ChangeLog | 16 ++++++++++++++++ calendar/gui/Makefile.am | 4 ++-- calendar/gui/dialogs/Makefile.am | 4 ++-- calendar/gui/dialogs/comp-editor-util.c | 2 +- calendar/gui/dialogs/e-delegate-dialog.c | 2 +- calendar/gui/e-meeting-model.c | 12 ++++++------ 6 files changed, 28 insertions(+), 12 deletions(-) (limited to 'calendar') 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 + + * 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 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 #include #include -#include +#include #include #include #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 #include #include -#include +#include #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 #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -- cgit v1.2.3