diff options
| author | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
| commit | 200606f92810d3de322e5ee96f8326e1a656f8bb (patch) | |
| tree | da0dc27f5311128dcb6e7eb6400931e45743372e /addressbook/util | |
| parent | e5472b4cc9a4bb80b89437a16f8b77943ea35555 (diff) | |
| download | gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.gz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.bz2 gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.lz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.xz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.zst gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.zip | |
Various changes to merge in evolution-data-server reliance.
svn path=/trunk/; revision=23206
Diffstat (limited to 'addressbook/util')
| -rw-r--r-- | addressbook/util/Makefile.am | 8 | ||||
| -rw-r--r-- | addressbook/util/eab-book-util.h | 4 | ||||
| -rw-r--r-- | addressbook/util/eab-destination.c | 2 | ||||
| -rw-r--r-- | addressbook/util/eab-destination.h | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index 51b6e7fc28..56aadd1153 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -19,16 +19,14 @@ INCLUDES = \ noinst_LTLIBRARIES = libeabutil.la libeabutil_la_SOURCES = \ - eab-marshal.c \ + eab-marshal.c \ eab-destination.c \ eab-destination.h \ eab-book-util.c \ eab-book-util.h -libeabutil_la_LIBADD = \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/ename/libename.la \ +libeabutil_la_LIBADD = \ + $(top_builddir)/camel/libcamel.la \ $(top_builddir)/e-util/libeutil.la MARSHAL_GENERATED = eab-marshal.c eab-marshal.h diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index be5451b795..7fda98adf3 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -28,10 +28,10 @@ #ifndef __EAB_UTIL_H__ #define __EAB_UTIL_H__ -#include "ebook/e-book-async.h" -#include "e-util/e-config-listener.h" #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-moniker-util.h> +#include <libebook/e-book-async.h> +#include "e-util/e-config-listener.h" G_BEGIN_DECLS diff --git a/addressbook/util/eab-destination.c b/addressbook/util/eab-destination.c index d83ad8563a..07557b1455 100644 --- a/addressbook/util/eab-destination.c +++ b/addressbook/util/eab-destination.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> -#include "ebook/e-book.h" +#include <libebook/e-book.h> #include "eab-marshal.h" #include "eab-book-util.h" #include <gal/widgets/e-unicode.h> diff --git a/addressbook/util/eab-destination.h b/addressbook/util/eab-destination.h index 452d893e44..2c8e2abc11 100644 --- a/addressbook/util/eab-destination.h +++ b/addressbook/util/eab-destination.h @@ -30,8 +30,8 @@ #include <glib.h> #include <glib-object.h> -#include <ebook/e-contact.h> -#include <ebook/e-book.h> +#include <libebook/e-contact.h> +#include <libebook/e-book.h> #include <libxml/tree.h> #define EAB_TYPE_DESTINATION (eab_destination_get_type ()) |