[evolution/email-factory-3-4] libemail-engine/Makefile.am cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit 8ece97246455b3d411b532523323cd39844e2fba
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jan 18 14:21:53 2012 -0500

    libemail-engine/Makefile.am cleanups.

 libemail-engine/Makefile.am |   86 ++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 42 deletions(-)
---
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 8c5ac0f..0f0a061 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -1,9 +1,7 @@
+NULL =
 
 lib_LTLIBRARIES = libemail-engine.la
 
-AM_CFLAGS = -I$(top_builddir) @GNOME_PLATFORM_CFLAGS@ -Wall -Werror -g3 -O0 -ggdb -DPKGDATADIR="\"$(pkgdatadir)\""
-AM_LDFLAGS = @GNOME_PLATFORM_LIBS@ 
-
 include $(top_srcdir)/glib-gen.mak
 glib_enum_headers=e-mail-enums.h
 glib_enum_output=e-mail-enumtypes
@@ -13,55 +11,59 @@ glib_enum_prefix=e_mail
 ENUM_GENERATED = e-mail-enumtypes.h e-mail-enumtypes.c
 
 libemail_engine_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)	\
-	$(CAMEL_CFLAGS)		\
-	$(GNOME_PLATFORM_CFLAGS)
-
-libemail_engine_la_LIBADD = 	\
-		$(CAMEL_LIBS)		\
-		$(GNOME_PLATFORM_LIBS)	\
-		$(top_builddir)/libemail-utils/libemail-utils.la
-		
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	$(EVOLUTION_DATA_SERVER_CFLAGS) \
+	$(GNOME_PLATFORM_CFLAGS) \
+	$(NULL)
 
-libemail_engine_la_LDFLAGS = 
+libmailengineincludedir = $(privincludedir)/libemail-engine
+libmailengineinclude_HEADERS =  \
+	e-mail-enums.h \
+	e-mail-enums.h \
+	e-mail-enumtypes.h \
+	e-mail-folder-utils.h \
+	e-mail-junk-filter.h
+	e-mail-session-utils.h \
+	e-mail-session.c \
+	e-mail-session.h \
+	e-mail-store-utils.h \
+	e-mail-utils.h \
+	mail-config.h \
+	mail-ops.h \
+	mail-tools.h \
+	$(NULL)
 
-libemail_engine_la_SOURCES = 	\
-		e-mail-enumtypes.c	\
-		e-mail-folder-utils.c	\
-		e-mail-store-utils.c	\
-		mail-tools.c		\
-		e-mail-utils.c		\
-		mail-config.c		\
-		mail-folder-cache.c	\
-		e-mail-session-utils.c	\
-		mail-ops.c		\
-		e-mail-junk-filter.c	\
-		e-mail-session.c	
+libemail_engine_la_SOURCES =  \
+	$(libmailengineinclude_HEADERS) \
+	e-mail-enumtypes.c \
+	e-mail-folder-utils.c \
+	e-mail-junk-filter.c \
+	e-mail-session-utils.c \
+	e-mail-session.c \
+	e-mail-store-utils.c \
+	e-mail-utils.c \
+	mail-config.c \
+	mail-folder-cache.c \
+	mail-ops.c \
+	mail-tools.c \
+	$(NULL)
 
-libmailengineincludedir = $(privincludedir)/libemail-engine
-libmailengineinclude_HEADERS = 	\
-		e-mail-enums.h		\
-		e-mail-enumtypes.h	\
-		e-mail-session.h	\
-		e-mail-enums.h		\
-		e-mail-session.c	\
-		e-mail-folder-utils.h	\
-		e-mail-store-utils.h	\
-		mail-tools.h		\
-		e-mail-utils.h		\
-		mail-config.h		\
-		e-mail-session-utils.h	\
-		mail-ops.h		\
-		e-mail-junk-filter.h
+libemail_engine_la_LIBADD = \
+	$(top_builddir)/libemail-utils/libemail-utils.la \
+	$(EVOLUTION_DATA_SERVER_LIBS) \
+	$(GNOME_PLATFORM_LIBS) \
+	$(NULL)
 
+libemail_engine_la_LDFLAGS = $(NO_UNDEFINED)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libemail-engine.pc
 
 BUILT_SOURCES = $(ENUM_GENERATED)
 
-EXTRA_DIST = 
-CLEANFILES    = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 dist-hook: