diff options
| author | Peter Williams <peterw@ximian.com> | 2002-07-11 05:34:37 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2002-07-11 05:34:37 +0800 |
| commit | 9e759ac6e1fb3d3c363e7a91bafb643e17cc87db (patch) | |
| tree | 47ccf7d87b6a46fc01b93f24adc465a289ffad21 /addressbook/gui/merging | |
| parent | 93248701c8dec093723f78b809a857b0a4183e5c (diff) | |
| download | gsoc2013-evolution-9e759ac6e1fb3d3c363e7a91bafb643e17cc87db.tar.gz 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 'addressbook/gui/merging')
| -rw-r--r-- | addressbook/gui/merging/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/merging/e-card-merging.c | 2 |
2 files changed, 3 insertions, 2 deletions
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" |