[evolution-data-server] Bug #677610 - Avoid modification of CPPFLAGS in Makefile.am

[Milan Crha <mcrha src gnome org>]

commit e948670435cc8febb89101be55af0288518e08df
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 7 14:08:52 2012 +0200

    Bug #677610 - Avoid modification of CPPFLAGS in Makefile.am

 libedataserverui/Makefile.am |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index 28ea8b3..abecb12 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -2,7 +2,9 @@
 MARSHAL_GENERATED = e-data-server-ui-marshal.c e-data-server-ui-marshal.h
 @EVO_MARSHAL_RULE@
 
-CPPFLAGS = \
+lib_LTLIBRARIES = libedataserverui-3.0.la
+
+libedataserverui_3_0_la_CPPFLAGS = 		\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/addressbook		\
@@ -15,9 +17,9 @@ CPPFLAGS = \
 	$(E_DATA_SERVER_UI_CFLAGS)		\
 	$(GNOME_KEYRING_CFLAGS)			\
 	$(CAMEL_CFLAGS)				\
-	$(SOUP_CFLAGS)
-
-lib_LTLIBRARIES = libedataserverui-3.0.la
+	$(SOUP_CFLAGS)				\
+	$(CODE_COVERAGE_CFLAGS)			\
+	$(NULL)
 
 libedataserveruiinclude_HEADERS =	\
 	libedataserverui.h		\
@@ -73,11 +75,6 @@ libedataserverui_3_0_la_SOURCES =	\
 	e-tree-model-generator.c	\
 	e-cell-renderer-color.c
 
-libedataserverui_3_0_la_CPPFLAGS = \
-	$(CPPFLAGS) \
-	$(CODE_COVERAGE_CFLAGS) \
-	$(NULL)
-
 libedataserverui_3_0_la_LIBADD = 				\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la		\