remove camel, add ADDRESSBOOK_LIBS.

2004-11-16  Not Zed  <NotZed@Ximian.com>

        * util/Makefile.am (libeabutil_la_LIBADD): remove camel, add
        ADDRESSBOOK_LIBS.

        * conduit/Makefile.am (libeaddress_conduit_la_LIBADD): remove
        camel.

        * gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
        remove camel.

2004-11-15  Not Zed  <NotZed@Ximian.com>

        * *.c: Moved various things from e-util to libedataserver, where
        appropriate.

svn path=/trunk/; revision=28048

7 files changed, 20 insertions, 6 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c6792eb0e0..b3ac540e46 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -97,6 +97,22 @@
        Fix for  #67656
 
 
+2004-11-16  Not Zed  <NotZed@Ximian.com>
+
+	* util/Makefile.am (libeabutil_la_LIBADD): remove camel, add
+	ADDRESSBOOK_LIBS.
+
+	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD): remove
+	camel.
+
+	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
+	remove camel.
+
+2004-11-15  Not Zed  <NotZed@Ximian.com>
+
+	* *.c: Moved various things from e-util to libedataserver, where
+	appropriate.
+
 2004-11-08  Andre Klapper  <a901600@gmx.de>
 
 	Fixes bug #61966.
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index cde1ac2092..f93b9bce1b 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -20,7 +20,6 @@ libeaddress_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/e-util/libeconduit.la		 		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
-	$(top_builddir)/camel/libcamel.la	 			\
 	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
 
 e-address-$(BASE_VERSION).conduit: e-address.conduit.in
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index adf772206c..c8c2cc79a3 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -60,7 +60,6 @@ libevolution_addressbook_la_LIBADD =							\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
 	$(top_builddir)/widgets/menus/libmenus.la					\
 	$(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la		\
-	$(top_builddir)/camel/libcamel.la						\
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
 
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
index 2bf0341e40..d3fcc50021 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -39,7 +39,7 @@
 #include <addressbook/util/e-destination.h>
 #include <addressbook/gui/merging/eab-contact-compare.h>
 
-#include <e-util/e-sexp.h>
+#include <libedataserver/e-sexp.h>
 
 typedef struct {
 	EBook *book;
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index cfa8a021e2..bc8b6194e0 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -45,7 +45,7 @@
 #include <gal/widgets/e-categories-master-list-option-menu.h>
 #include <gal/e-text/e-entry.h>
 #include <e-util/e-categories-master-list-wombat.h>
-#include "e-util/e-sexp.h"
+#include <libedataserver/e-sexp.h>
 
 static void  e_select_names_init       (ESelectNames		 *names);
 static void  e_select_names_class_init (ESelectNamesClass	 *klass);
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 0d55297df1..ab65a87734 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -47,7 +47,7 @@
 #include "addressbook/gui/widgets/eab-menu.h"
 
 #include "e-util/e-categories-master-list-wombat.h"
-#include "e-util/e-sexp.h"
+#include "libedataserver/e-sexp.h"
 
 #ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
 #include <gal/widgets/e-treeview-selection-model.h>
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index 6d5592139d..248ef7313c 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -20,7 +20,7 @@ libeabutil_la_SOURCES =					\
 	eab-book-util.h
 
 libeabutil_la_LIBADD =					\
-	$(top_builddir)/camel/libcamel.la		\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
 	$(top_builddir)/e-util/libeutil.la
 
 MARSHAL_GENERATED = eab-marshal.c eab-marshal.h