[evolution/email-factory-3-4] Drop EMAIL_UTILS and EMAIL_ENGINE automake variables.

[Matthew Barnes <mbarnes src gnome org>]

commit 01e233f9b3930d0eaebe5f501cbc42099bd73fe8
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jan 18 14:00:49 2012 -0500

    Drop EMAIL_UTILS and EMAIL_ENGINE automake variables.
    
    Use EVOLUTION_DATA_SERVER_CFLAGS / EVOLUTION_DATA_SERVER_LIBS.
    Covers all the same libraries.  When the time comes we'll add
    libemail-utils and libemail-engine flags to those definitions.

 configure.ac                |   14 --------------
 e-util/Makefile.am          |    4 +---
 libemail-engine/Makefile.am |    2 --
 libemail-utils/Makefile.am  |    4 +---
 mail/Makefile.am            |    4 ----
 modules/mail/Makefile.am    |    6 +-----
 shell/Makefile.am           |    3 +--
 7 files changed, 4 insertions(+), 33 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ac4a728..1022448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1222,20 +1222,6 @@ CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS"
 AC_SUBST(CERT_UI_CFLAGS)
 AC_SUBST(CERT_UI_LIBS)
 
-dnl ************
-dnl EMAILS_UTILS Flags
-dnl ************
-EVO_SET_COMPILE_FLAGS(EMAIL_UTILS, camel-1.2  libedataserver-1.2)
-AC_SUBST(EMAIL_UTILS_CFLAGS)
-AC_SUBST(EMAIL_UTILS_LIBS)
-
-dnl ************
-dnl EMAIL_ENGINE Flags
-dnl ************
-EVO_SET_COMPILE_FLAGS(EMAIL_ENGINE, camel-1.2  libedataserverui-3.0 libebackend-1.2 libedataserver-1.2)
-AC_SUBST(EMAIL_ENGINE_CFLAGS)
-AC_SUBST(EMAIL_ENGINE_LIBS)
-
 dnl ***************
 dnl Libnotify Flags
 dnl ***************
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 0196071..2e401e2 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -81,8 +81,7 @@ libeutil_la_CPPFLAGS =							\
 	-DEVOLUTION_RULEDIR=\"$(ruledir)\"				\
 	-DG_LOG_DOMAIN=\"e-utils\"					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(EMAIL_UTILS_CFLAGS)		
+	$(GNOME_PLATFORM_CFLAGS)
 
 libeutil_la_SOURCES =				\
 	$(eutilinclude_HEADERS)			\
@@ -128,7 +127,6 @@ libeutil_la_LIBADD = 			\
 	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(ICONV_LIBS)			\
 	$(EVOLUTION_DATA_SERVER_LIBS)	\
-	$(EMAIL_UTILS_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)		\
 	$(INTLLIBS)
 
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 8679677..8c5ac0f 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -14,13 +14,11 @@ ENUM_GENERATED = e-mail-enumtypes.h e-mail-enumtypes.c
 
 libemail_engine_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)	\
-	$(EMAIL_ENGINE_CFLAGS)	\
 	$(CAMEL_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)
 
 libemail_engine_la_LIBADD = 	\
 		$(CAMEL_LIBS)		\
-		$(EMAIL_ENGINE_LIBS)	\
 		$(GNOME_PLATFORM_LIBS)	\
 		$(top_builddir)/libemail-utils/libemail-utils.la
 		
diff --git a/libemail-utils/Makefile.am b/libemail-utils/Makefile.am
index 638fcfa..283e8ce 100644
--- a/libemail-utils/Makefile.am
+++ b/libemail-utils/Makefile.am
@@ -8,13 +8,11 @@ libemail_utils_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)	\
 	$(CAMEL_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS) \
-	$(EMAIL_UTILS_CFLAGS)	\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	
 
 libemail_utils_la_LIBADD = 	\
 		$(CAMEL_LIBS)		\
-		$(GNOME_PLATFORM_LIBS)	\
-		$(EMAIL_UTILS_LIBS)
+		$(GNOME_PLATFORM_LIBS)
 
 libemail_utils_la_LDFLAGS = 
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 6aea7f0..742a0a3 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -23,8 +23,6 @@ libevolution_mail_la_CPPFLAGS =				\
 	$(CANBERRA_CFLAGS)				\
 	$(CLUTTER_CFLAGS)				\
 	$(GTKHTML_CFLAGS)				\
-	$(EMAIL_UTILS_CFLAGS)				\
-	$(EMAIL_ENGINE_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
@@ -192,8 +190,6 @@ libevolution_mail_la_LIBADD =				\
 	$(top_builddir)/filter/libfilter.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(EMAIL_UTILS_LIBS)				\
-	$(EMAIL_ENGINE_LIBS)				\
 	$(CERT_UI_LIBS)					\
 	$(CANBERRA_LIBS)				\
 	$(CLUTTER_LIBS)					\
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 6805d17..d168878 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -5,8 +5,6 @@ libevolution_module_mail_la_CPPFLAGS =					\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/mail						\
 	-I$(top_srcdir)/widgets						\
-	$(EMAIL_UTILS_CFLAGS)						\
-	$(EMAIL_ENGINE_CFLAGS)						\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
@@ -72,9 +70,7 @@ libevolution_module_mail_la_LIBADD =					\
 	$(top_builddir)/capplet/settings/libevolution-mail-settings.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
-	$(GTKHTML_LIBS)							\
-	$(EMAIL_UTILS_LIBS)						\
-	$(EMAIL_ENGINE_LIBS)						
+	$(GTKHTML_LIBS)
 
 libevolution_module_mail_la_LDFLAGS =					\
 	-avoid-version -module $(NO_UNDEFINED)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index afae3c5..57b9b0c 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -133,8 +133,7 @@ evolution_CPPFLAGS =						\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)					\
-	$(CLUTTER_CFLAGS)					\
-	$(EMAIL_UTILS_CFLAGS)					
+	$(CLUTTER_CFLAGS)
 
 evolution_SOURCES =				\
 	main.c