[evolution/eds-mailer: 48/49] Split the mail library in two

[Jonathon Jongsma <jjongsma src gnome org>]

commit 372e4d5e7e5c667b8741b4207fefbba6c43124fa
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Wed Jan 6 17:16:52 2010 -0600

    Split the mail library in two
    
    libevolution-mail.la has been split in two pieces.  The stuff that will be moved
    down into eds to form the core of the mailer is now known as libedsmail.  For
    now, there is a dependency from libevolution-mail on libedsmail, but this will
    eventually be replaced with a DBus API.
    
    libevolution-mail will probably serve as a shared mail utility library that can
    be used from both evolution or anjal, etc.

 mail/Makefile.am |   67 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 52 insertions(+), 15 deletions(-)
---
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 5503de8..eb06183 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,22 +1,43 @@
 SUBDIRS = . default importers
 
-privsolib_LTLIBRARIES = libevolution-mail.la
+privsolib_LTLIBRARIES = libedsmail.la libevolution-mail.la
 
 mailincludedir = $(privincludedir)/mail
 
+libedsmail_la_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/smime/lib			\
+	-I$(top_srcdir)/smime/gui			\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(CERT_UI_CFLAGS)				\
+	$(CANBERRA_CFLAGS)				\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
+	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
+	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
+	-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\"		\
+	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"		\
+	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
+	-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
+	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
+	-DPREFIX=\""$(prefix)"\"			\
+	-DG_LOG_DOMAIN=\"evolution-mail\"
+
 libevolution_mail_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/smime/lib			\
+	-I$(top_srcdir)/smime/gui			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)					\
 	-I$(top_srcdir)/em-format			\
-	-I$(top_srcdir)/mail				\
 	-I$(top_srcdir)/composer			\
 	-I$(top_builddir)/composer			\
 	-I$(top_builddir)/shell				\
 	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/smime/lib			\
-	-I$(top_srcdir)/smime/gui			\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CERT_UI_CFLAGS)				\
@@ -96,6 +117,19 @@ mailinclude_HEADERS =					\
 	mail-utils.h					\
 	message-list.h
 
+libedsmail_la_SOURCES =					\
+	e-mail-local.c					\
+	e-mail-msg.c					\
+	e-mail-store.c					\
+	e-mail-task-manager.c				\
+	mail-config.c					\
+	mail-folder-cache.c				\
+	mail-mt.c					\
+	mail-ops.c					\
+	mail-session.c					\
+	mail-tools.c					\
+	mail-utils.c
+
 libevolution_mail_la_SOURCES =				\
 	e-mail-attachment-bar.c				\
 	e-mail-backend.c				\
@@ -106,16 +140,12 @@ libevolution_mail_la_SOURCES =				\
 	e-mail-label-list-store.c			\
 	e-mail-label-manager.c				\
 	e-mail-label-tree-view.c			\
-	e-mail-local.c					\
 	e-mail-migrate.c				\
-	e-mail-msg.c					\
 	e-mail-reader.c					\
 	e-mail-reader-utils.c				\
 	e-mail-search-bar.c				\
 	e-mail-sidebar.c				\
-	e-mail-store.c					\
 	e-mail-tag-editor.c				\
-	e-mail-task-manager.c				\
 	e-searching-tokenizer.c				\
 	em-account-editor.c				\
 	em-composer-utils.c				\
@@ -147,13 +177,7 @@ libevolution_mail_la_SOURCES =				\
 	em-vfolder-editor.c				\
 	em-vfolder-rule.c				\
 	mail-autofilter.c				\
-	mail-config.c					\
-	mail-folder-cache.c				\
-	mail-mt.c					\
-	mail-ops.c					\
 	mail-send-recv.c				\
-	mail-session.c					\
-	mail-tools.c					\
 	mail-vfolder.c					\
 	mail-utils.c					\
 	message-list.c
@@ -164,6 +188,18 @@ SMIME_LIBS =						\
 	$(top_builddir)/smime/gui/libevolution-smime.la
 endif
 
+libedsmail_la_LIBADD =				\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(EVOLUTION_MAIL_LIBS)				\
+	$(CERT_UI_LIBS)					\
+	$(CANBERRA_LIBS)				\
+	$(GTKHTML_LIBS)					\
+	$(E_WIDGETS_LIBS)				\
+	$(SMIME_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)
+
+libedsmail_la_LDFLAGS = $(NO_UNDEFINED)
+
 libevolution_mail_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
@@ -175,6 +211,7 @@ libevolution_mail_la_LIBADD =				\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 	$(top_builddir)/em-format/libemformat.la	\
 	$(top_builddir)/filter/libfilter.la		\
+	$(top_builddir)/mail/libedsmail.la		\
 	$(EVOLUTION_MAIL_LIBS)				\
 	$(CERT_UI_LIBS)					\
 	$(CANBERRA_LIBS)				\