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

[Matthew Barnes <mbarnes src gnome org>]

commit 7b0aba03156018cfb9925a7b53cab0829150d2d6
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 79652c4..02d59b6 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)
 
@@ -78,7 +77,6 @@ libeabwidgets_la_LIBADD =                                     \
        $(top_builddir)/addressbook/util/libeabutil.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 b2947d2..5435ce1 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 be923f7..5084abf 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 = \
@@ -64,7 +63,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 540d61a..ea48d8e 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                     \
@@ -75,8 +74,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)