[evolution/webkit-composer: 67/130] Drop addressbook and calendar dependency on Gtkhtml

[Matthew Barnes <mbarnes src gnome org>]

commit 678aa20f23f6c2cfde3838476b6256b631c7ab08
Author: Dan VrÃtil <dvratil redhat com>
Date:   Tue Aug 28 17:38:18 2012 +0200

    Drop addressbook and calendar dependency on Gtkhtml

 addressbook/gui/merging/Makefile.am |    3 +--
 addressbook/gui/widgets/Makefile.am |    2 --
 calendar/gui/Makefile.am            |    2 --
 calendar/importers/Makefile.am      |    6 ++----
 modules/addressbook/Makefile.am     |    2 --
 modules/calendar/Makefile.am        |    6 ++----
 6 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 319c122..99b9f7c 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -7,8 +7,7 @@ libeabbookmerging_la_CPPFLAGS =				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 libeabbookmerging_la_SOURCES =			\
 	eab-contact-compare.c			\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 4881613..4ec348e 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -18,7 +18,6 @@ libeabwidgets_la_CPPFLAGS =				\
 	-I$(top_builddir)/shell				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)				\
 	$(CHAMPLAIN_CFLAGS)				\
 	$(GEO_CFLAGS)
 
@@ -77,7 +76,6 @@ libeabwidgets_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(GTKHTML_LIBS)						\
 	$(CHAMPLAIN_LIBS)					\
 	$(GEO_LIBS)
 
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b086902..fc83315 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -68,7 +68,6 @@ libevolution_calendar_la_CPPFLAGS =			\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)				\
 	$(LIBSOUP_CFLAGS)
 
 etspec_DATA =				\
@@ -209,7 +208,6 @@ libevolution_calendar_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
-	$(GTKHTML_LIBS)							\
 	$(LIBSOUP_LIBS)
 
 libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index a6fb303..e7a1ec7 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -8,8 +8,7 @@ libevolution_calendar_importers_la_CPPFLAGS = 		\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_calendar_importers_la_SOURCES = \
 	evolution-calendar-importer.h	     \
@@ -21,7 +20,6 @@ libevolution_calendar_importers_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(GTKHTML_LIBS)
+	$(GNOME_PLATFORM_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 759f195..b5a2b64 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -19,7 +19,6 @@ module_addressbook_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(CHAMPLAIN_CFLAGS)					\
-	$(GTKHTML_CFLAGS)					\
 	$(LDAP_CFLAGS)
 
 module_addressbook_la_SOURCES = \
@@ -68,7 +67,6 @@ module_addressbook_la_LIBADD = \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(CHAMPLAIN_LIBS)					\
-	$(GTKHTML_LIBS)						\
 	$(LDAP_LIBS)
 
 
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 35e630e..c8f5bef 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -8,8 +8,7 @@ module_calendar_la_CPPFLAGS = \
 	-I$(top_srcdir)					\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 module_calendar_la_SOURCES = \
 	evolution-module-calendar.c			\
@@ -91,8 +90,7 @@ module_calendar_la_LIBADD = \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 	$(top_builddir)/e-util/libeutil.la				\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)						\
-	$(GTKHTML_LIBS)
+	$(GNOME_PLATFORM_LIBS)
 
 module_calendar_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)