[evolution/gnome-2-30] Fix build settings under capplet.

[Matthew Barnes <mbarnes src gnome org>]

commit 7e567893e6de45650b0f425b37b2dc4e86fad701
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Mar 31 11:32:05 2010 -0400

    Fix build settings under capplet.

 capplet/Makefile.am          |   17 +++++------------
 capplet/settings/Makefile.am |   14 +++++---------
 2 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index aac8cf7..b84e284 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -1,6 +1,9 @@
 SUBDIRS = settings
 
-AM_CPPFLAGS = \
+bin_PROGRAMS = evolution-settings
+
+evolution_settings_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_srcdir)					\
@@ -30,22 +33,12 @@ AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-mail\"		\
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
-	
-AM_CFLAGS =\
-	 -Wall\
-	 -g -O0 
-
-bin_PROGRAMS = evolution-settings
-
 
 evolution_settings_SOURCES  = \
 	anjal-settings-main.c 
 
-evolution_settings_LDFLAGS = \
-	-Wl,--export-dynamic
-
 if OS_WIN32
-evolution_settings_LDFLAGS += -mwindows
+evolution_settings_LDFLAGS = -mwindows
 endif
 
 evolution_settings_LDADD = 				\
diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am
index 91ee98d..dde24ee 100644
--- a/capplet/settings/Makefile.am
+++ b/capplet/settings/Makefile.am
@@ -1,5 +1,8 @@
 
-AM_CPPFLAGS = \
+privsolib_LTLIBRARIES = libevolution-mail-settings.la
+
+libevolution_mail_settings_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_srcdir)					\
@@ -16,6 +19,7 @@ AM_CPPFLAGS = \
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CERT_UI_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
+	-DANJAL_SETTINGS				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
@@ -30,12 +34,6 @@ AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-mail\"		\
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
-	
-AM_CFLAGS =\
-	 -Wall\
-	 -g -O0 
-
-privsolib_LTLIBRARIES = libevolution-mail-settings.la
 
 libevolution_mail_settings_la_SOURCES = \
 	mail-settings-view.c \
@@ -53,8 +51,6 @@ libevolution_mail_settings_la_SOURCES = \
 	mail-guess-servers.c \
 	mail-guess-servers.h
 
-libevolution_mail_settings_la_CFLAGS = -DANJAL_SETTINGS
-
 libevolution_mail_settings_la_LIBADD = 				\
 	$(EVOLUTION_MAIL_LIBS)				\
 	$(CERT_UI_LIBS)					\