diff options
Diffstat (limited to 'addressbook/backend')
| -rw-r--r-- | addressbook/backend/ebook/Makefile.am | 8 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am index 4b49660e7f..e3569a8df4 100644 --- a/addressbook/backend/ebook/Makefile.am +++ b/addressbook/backend/ebook/Makefile.am @@ -24,7 +24,8 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/ename \ -I$(top_builddir)/addressbook/backend \ -I$(top_builddir)/addressbook/ename \ - $(BONOBO_GNOME_CFLAGS) + $(BONOBO_GNOME_CFLAGS) \ + $(EXTRA_GNOME_CFLAGS) lib_LTLIBRARIES = libebook.la @@ -67,6 +68,7 @@ test_client_SOURCES = \ test_client_LDADD = \ libebook.la \ $(BONOBO_GNOME_LIBS) \ + $(EXTRA_GNOME_LIBS) \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/e-util/libeutil.la @@ -77,6 +79,7 @@ test_client_list_SOURCES = \ test_client_list_LDADD = \ libebook.la \ $(BONOBO_GNOME_LIBS) \ + $(EXTRA_GNOME_LIBS) \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/e-util/libeutil.la @@ -87,6 +90,7 @@ test_card_SOURCES = \ test_card_LDADD = \ libebook.la \ $(BONOBO_GNOME_LIBS) \ + $(EXTRA_GNOME_LIBS) \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/e-util/libeutil.la @@ -98,6 +102,7 @@ load_pine_addressbook_SOURCES = \ load_pine_addressbook_LDADD = \ libebook.la \ $(BONOBO_GNOME_LIBS) \ + $(EXTRA_GNOME_LIBS) \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/e-util/libeutil.la @@ -109,6 +114,7 @@ load_gnomecard_addressbook_SOURCES = \ load_gnomecard_addressbook_LDADD = \ libebook.la \ $(BONOBO_GNOME_LIBS) \ + $(EXTRA_GNOME_LIBS) \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/e-util/libeutil.la diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 83f321bc24..c2ab80a734 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -20,7 +20,7 @@ #include "e-name-western.h" #include "e-address-western.h" -#include <e-util/e-util.h> +#include <gal/util/e-util.h> #define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop))) #define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1)) diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index dbcae01d25..aa88609775 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -26,8 +26,8 @@ #include "pas-card-cursor.h" #include <ebook/e-card-simple.h> #include <e-util/e-sexp.h> -#include <e-util/e-util.h> -#include <e-util/e-unicode.h> +#include <gal/util/e-util.h> +#include <gal/widgets/e-unicode.h> #define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION" #define PAS_BACKEND_FILE_VERSION "0.1" |