Simplify library dependency flags.

We have a confusing array of nearly-identical CFLAGS/LIBS definitions in
configure.ac.  Time to simplify.  Instead let's just have one definition
that includes all the libraries provided by Evolution-Data-Server (incl.
Camel).  That, in combination with GNOME_PLATFORM, gives us most of what
we need for compliation and linking, and we can sprinkle definitions for
additional library dependencies in Makefile.am's as needed.

5 files changed, 32 insertions, 33 deletions

diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index fe5d468b3a..396ce6a4a5 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -6,8 +6,8 @@ libetimezonedialog_la_CPPFLAGS =					\
 	-I$(top_srcdir)/widgets						\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DG_LOG_DOMAIN=__FILE__						\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(TZDIALOG_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libetimezonedialog_la_SOURCES =	\
 	e-timezone-dialog.c	\
@@ -18,8 +18,7 @@ libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
 libetimezonedialog_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(EVOLUTION_CALENDAR_LIBS)
-	$(TZDIALOG_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 ui_DATA = e-timezone-dialog.ui
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index 3a33e64651..0dc38fce28 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -6,8 +6,8 @@ libmenus_la_CPPFLAGS =				\
 	-I$(top_srcdir)/widgets			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"  \
 	-DG_LOG_DOMAIN=\"menus\"		\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(E_UTIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libmenus_la_SOURCES = 				\
 	gal-define-views-dialog.c		\
@@ -46,8 +46,8 @@ libmenus_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/table/libetable.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(GNOME_PLATFORM_LIBS)				\
-	$(E_UTIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)
 
 icons =
 EXTRA_DIST =			\
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 33bde9301c..cd5cada041 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -78,15 +78,15 @@ libemiscwidgets_la_CPPFLAGS =						\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/filter						\
 	-I$(top_srcdir)/widgets						\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"				\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DG_LOG_DOMAIN=__FILE__						\
-	$(EVOLUTION_MAIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
 	$(CHAMPLAIN_CFLAGS)						\
 	$(GEOCLUE_CFLAGS)						\
-	$(CLUTTER_CFLAGS)
-	
+	$(CLUTTER_CFLAGS)						\
+	$(GTKHTML_CFLAGS)
 
 libemiscwidgets_la_SOURCES =			\
 	$(widgetsinclude_HEADERS)		\
@@ -165,13 +165,14 @@ libemiscwidgets_la_LIBADD =					\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(EVOLUTION_MAIL_LIBS)					\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(MATH_LIB)						\
 	$(ICONV_LIBS)						\
 	$(CHAMPLAIN_LIBS)					\
 	$(GEOCLUE_LIBS)						\
-	$(CLUTTER_LIBS)
+	$(CLUTTER_LIBS)						\
+	$(GTKHTML_LIBS)
 
 noinst_PROGRAMS = 			\
 	test-calendar			\
@@ -183,9 +184,9 @@ test_widgets_misc_CPPFLAGS=						\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/filter						\
 	-I$(top_srcdir)/widgets						\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"				\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DG_LOG_DOMAIN=__FILE__						\
-	$(EVOLUTION_MAIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)
 
 # test-calendar
@@ -199,8 +200,8 @@ test_calendar_LDADD = 				\
 	libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/filter/libfilter.la	\
-	$(GNOME_PLATFORM_LIBS)			\
-	$(E_WIDGETS_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)
 
 # test-dateedit
 
@@ -213,8 +214,8 @@ test_dateedit_LDADD = 				\
 	libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/filter/libfilter.la	\
-	$(GNOME_PLATFORM_LIBS)			\
-	$(E_WIDGETS_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)
 
 # test-preferences-window
 
@@ -227,8 +228,8 @@ test_preferences_window_LDADD = 		\
 	libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/filter/libfilter.la	\
-	$(GNOME_PLATFORM_LIBS)			\
-	$(E_WIDGETS_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = $(ui_DATA)
 
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 0ae1e2b7e9..36af5ec2bf 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -7,11 +7,10 @@ libetable_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
-	$(E_UTIL_CFLAGS)			\
-	$(E_WIDGETS_CFLAGS)			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
-	-DEVOLUTION_UIDIR=\"$(uidir)\"	\
-        -DG_LOG_DOMAIN=\"e-table\"
+	-DEVOLUTION_UIDIR=\"$(uidir)\"		\
+	-DG_LOG_DOMAIN=\"e-table\"
 
 libetable_la_SOURCES = 				\
 	e-cell.c				\
@@ -173,10 +172,9 @@ libetable_la_LIBADD =						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/text/libetext.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(E_UTIL_LIBS)						\
-	$(E_WIDGETS_LIBS)					\
-	$(MATH_LIB)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(MATH_LIB)
 
 icons = 			\
 	arrow-down.xpm		\
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index 2577c6fe14..d7c62af74e 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -4,7 +4,7 @@ libetext_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
-	$(E_UTIL_CFLAGS)			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
 	-DG_LOG_DOMAIN=\"e-text\"
 
@@ -35,8 +35,9 @@ libetext_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(E_UTIL_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(REGEX_LIBS)
+	$(REGEX_LIBS)						\
+	$(MATH_LIB)
 
 -include $(top_srcdir)/git.mk