[evolution/wip/webkit-composer: 138/372] Drop GtkHTML dependency.
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 138/372] Drop GtkHTML dependency.
- Date: Thu, 6 Feb 2014 11:35:06 +0000 (UTC)
commit a365b92bcf5c2193a7747698fc2b5ab0baa2ff5c
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jul 7 17:40:46 2013 -0400
Drop GtkHTML dependency.
addressbook/gui/contact-editor/Makefile.am | 4 ++--
addressbook/gui/contact-list-editor/Makefile.am | 4 ++--
addressbook/gui/widgets/Makefile.am | 8 ++++----
addressbook/importers/Makefile.am | 6 +++---
addressbook/printing/Makefile.am | 4 ++--
addressbook/util/Makefile.am | 8 ++++----
calendar/alarm-notify/Makefile.am | 6 +++---
calendar/gui/Makefile.am | 8 ++++----
calendar/gui/dialogs/Makefile.am | 4 ++--
calendar/importers/Makefile.am | 4 ++--
composer/Makefile.am | 4 ++--
configure.ac | 13 -------------
doc/reference/evolution-mail-composer/Makefile.am | 2 --
doc/reference/evolution-mail-formatter/Makefile.am | 2 --
doc/reference/evolution-shell/Makefile.am | 2 --
doc/reference/evolution-util/Makefile.am | 2 --
e-util/Makefile.am | 2 --
em-format/Makefile.am | 8 ++++----
libemail-engine/Makefile.am | 2 --
mail/Makefile.am | 5 ++---
mail/importers/Makefile.am | 4 ++--
modules/addressbook/Makefile.am | 8 ++++----
modules/backup-restore/Makefile.am | 4 ----
modules/book-config-google/Makefile.am | 4 ++--
modules/book-config-ldap/Makefile.am | 8 ++++----
modules/book-config-local/Makefile.am | 4 ++--
modules/book-config-webdav/Makefile.am | 4 ++--
modules/cal-config-caldav/Makefile.am | 8 ++++----
modules/cal-config-contacts/Makefile.am | 4 ++--
modules/cal-config-google/Makefile.am | 8 ++++----
modules/cal-config-local/Makefile.am | 4 ++--
modules/cal-config-weather/Makefile.am | 8 ++++----
modules/cal-config-webcal/Makefile.am | 4 ++--
modules/calendar/Makefile.am | 4 ++--
modules/composer-autosave/Makefile.am | 19 +++++++++++++------
modules/contact-photos/Makefile.am | 2 --
modules/gravatar/Makefile.am | 2 --
modules/itip-formatter/Makefile.am | 4 ++--
modules/itip-formatter/plugin/Makefile.am | 4 ++--
modules/mail-config/Makefile.am | 2 --
modules/mail/Makefile.am | 4 ++--
modules/mailto-handler/Makefile.am | 4 ++--
modules/mdn/Makefile.am | 4 ++--
modules/offline-alert/Makefile.am | 4 ++--
modules/plugin-lib/Makefile.am | 4 ++--
modules/plugin-manager/Makefile.am | 4 ++--
modules/prefer-plain/Makefile.am | 4 ++--
modules/prefer-plain/plugin/Makefile.am | 4 ++--
modules/settings/Makefile.am | 2 --
modules/spamassassin/Makefile.am | 4 ++--
modules/startup-wizard/Makefile.am | 2 --
modules/text-highlight/Makefile.am | 4 ++--
modules/tnef-attachment/Makefile.am | 8 ++++----
modules/vcard-inline/Makefile.am | 4 ++--
modules/web-inspector/Makefile.am | 4 ++--
plugins/attachment-reminder/Makefile.am | 4 ++--
plugins/bbdb/Makefile.am | 4 ++--
plugins/dbx-import/Makefile.am | 4 ++--
plugins/email-custom-header/Makefile.am | 4 ++--
plugins/external-editor/Makefile.am | 4 ++--
plugins/face/Makefile.am | 4 ++--
plugins/mail-notification/Makefile.am | 4 ++--
plugins/mail-to-task/Makefile.am | 4 ++--
plugins/mailing-list-actions/Makefile.am | 4 ++--
plugins/pst-import/Makefile.am | 8 ++++----
plugins/publish-calendar/Makefile.am | 8 ++++----
plugins/save-calendar/Makefile.am | 4 ++--
plugins/templates/Makefile.am | 4 ++--
shell/Makefile.am | 8 ++++----
smime/gui/Makefile.am | 8 ++++----
smime/lib/Makefile.am | 8 ++++----
71 files changed, 159 insertions(+), 192 deletions(-)
---
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 4e5d0b7..27d25cf 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -11,7 +11,7 @@ libecontacteditor_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"contact-editor\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
libecontacteditor_la_SOURCES = \
eab-editor.c \
@@ -33,7 +33,7 @@ libecontacteditor_la_LIBADD = \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
ui_DATA = \
contact-editor.ui \
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 01a04bc..b6417d3 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -11,7 +11,7 @@ libecontactlisteditor_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"contact-list-editor\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
libecontactlisteditor_la_SOURCES = \
e-contact-list-editor.c \
@@ -28,7 +28,7 @@ libecontactlisteditor_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
ui_DATA = contact-list-editor.ui
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index bfebe21..9400ae5 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -18,9 +18,9 @@ libeabwidgets_la_CPPFLAGS = \
-I$(top_builddir)/shell \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
- $(GEO_CFLAGS)
+ $(GEO_CFLAGS) \
+ $(NULL)
eabincludedir = $(privincludedir)/addressbook/gui/widgets
@@ -78,9 +78,9 @@ libeabwidgets_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(CHAMPLAIN_LIBS) \
- $(GEO_LIBS)
+ $(GEO_LIBS) \
+ $(NULL)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index cce02a0..17d1cd5 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -10,7 +10,7 @@ libevolution_addressbook_importers_la_CPPFLAGS = \
-I$(top_builddir)/addressbook \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
libevolution_addressbook_importers_la_SOURCES = \
evolution-ldif-importer.c \
@@ -26,7 +26,7 @@ libevolution_addressbook_importers_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(IMPORTERS_LIBS)
+ $(IMPORTERS_LIBS) \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 58f2ca1..bd2e4c5 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -13,7 +13,7 @@ libecontactprint_la_CPPFLAGS = \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
noinst_LTLIBRARIES = libecontactprint.la
@@ -27,7 +27,7 @@ libecontactprint_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = \
$(ecps_DATA)
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index f11c618..e098acd 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -12,8 +12,8 @@ libeabutil_la_CPPFLAGS = \
-I$(top_srcdir)/shell \
$(CAMEL_CFLAGS) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(GNOME_PLATFORM_CFLAGS)
+ $(GNOME_PLATFORM_CFLAGS) \
+ $(NULL)
libeabutil_la_SOURCES = \
eab-book-util.c \
@@ -26,8 +26,8 @@ libeabutil_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(CAMEL_LIBS) \
$(EVOLUTION_DATA_SERVER_LIBS) \
- $(GTKHTML_LIBS) \
- $(GNOME_PLATFORM_LIBS)
+ $(GNOME_PLATFORM_LIBS) \
+ $(NULL)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am
index 7c0b04c..dc3fd40 100644
--- a/calendar/alarm-notify/Makefile.am
+++ b/calendar/alarm-notify/Makefile.am
@@ -21,7 +21,7 @@ evolution_alarm_notify_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(CANBERRA_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
ui_DATA = \
alarm-notify.ui
@@ -54,8 +54,8 @@ evolution_alarm_notify_LDADD = \
$(GNOME_PLATFORM_LIBS) \
$(LIBNOTIFY_LIBS) \
$(CANBERRA_LIBS) \
- $(GTKHTML_LIBS)
- $(EVOLUTIONALARMNOTIFYICON)
+ $(EVOLUTIONALARMNOTIFYICON) \
+ $(NULL)
if OS_WIN32
evolution_alarm_notify_LDFLAGS = -mwindows
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 64ef0f3..c64c4ae 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -67,8 +67,8 @@ libevolution_calendar_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LIBSOUP_CFLAGS)
+ $(LIBSOUP_CFLAGS) \
+ $(NULL)
etspec_DATA = \
e-calendar-table.etspec \
@@ -206,8 +206,8 @@ libevolution_calendar_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(LIBSOUP_LIBS)
+ $(LIBSOUP_LIBS) \
+ $(NULL)
libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 42e6730..6a22266 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -14,7 +14,7 @@ libcal_dialogs_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
@@ -49,7 +49,7 @@ libcal_dialogs_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
libcal_dialogs_la_SOURCES = \
alarm-dialog.c \
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 686827c..282c0cb 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -9,7 +9,7 @@ libevolution_calendar_importers_la_CPPFLAGS = \
-I$(top_builddir)/calendar \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
libevolution_calendar_importers_la_SOURCES = \
evolution-calendar-importer.h \
@@ -22,6 +22,6 @@ libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 98eff38..14bf40b 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -36,7 +36,7 @@ libevolution_mail_composer_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"composer\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
libevolution_mail_composer_la_SOURCES = \
$(evolution_mail_composer_include_HEADERS) \
@@ -62,7 +62,7 @@ libevolution_mail_composer_la_LIBADD = \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
ui_DATA = evolution-composer.ui
diff --git a/configure.ac b/configure.ac
index d871884..7bed8f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,9 +46,6 @@ m4_define([soup_encoded_version], [SOUP_VERSION_2_42])
m4_define([eds_minimum_version], [evo_version])
m4_define([enchant_minimum_version], [1.1.7])
-m4_define([gtkhtml_minimum_version], [4.5.2])
-m4_define([gdk_pixbuf_minimum_version], [2.24.0])
-m4_define([gcr_minimum_version], [3.4])
m4_define([gnome_desktop_minimum_version], [2.91.3])
m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
@@ -622,16 +619,6 @@ AM_CONDITIONAL(SUNLDAP, [test x$with_sunldap != xno])
AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is free'ed properly])
-dnl *************************
-dnl GTKHTML check
-dnl XXX Drop the version from the package name?
-dnl *************************
-PKG_CHECK_MODULES([GTKHTML],
- [libgtkhtml-4.0 >= gtkhtml_minimum_version
- gtkhtml-editor-4.0])
-AC_SUBST(GTKHTML_CFLAGS)
-AC_SUBST(GTKHTML_LIBS)
-
dnl ********************************************************************************
dnl security extension support (SSL and S/MIME)
dnl
diff --git a/doc/reference/evolution-mail-composer/Makefile.am
b/doc/reference/evolution-mail-composer/Makefile.am
index 580dc63..3fbc28f 100644
--- a/doc/reference/evolution-mail-composer/Makefile.am
+++ b/doc/reference/evolution-mail-composer/Makefile.am
@@ -22,14 +22,12 @@ GTKDOC_CFLAGS= \
-I$(top_builddir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
GTKDOC_LIBS= \
$(top_builddir)/composer/libevolution-mail-composer.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/doc/reference/evolution-mail-formatter/Makefile.am
b/doc/reference/evolution-mail-formatter/Makefile.am
index aff3eb7..ed313fc 100644
--- a/doc/reference/evolution-mail-formatter/Makefile.am
+++ b/doc/reference/evolution-mail-formatter/Makefile.am
@@ -21,14 +21,12 @@ GTKDOC_CFLAGS= \
-I$(top_builddir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
GTKDOC_LIBS= \
$(top_builddir)/em-format/libevolution-mail-formatter.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/doc/reference/evolution-shell/Makefile.am b/doc/reference/evolution-shell/Makefile.am
index 7afbc72..c64068e 100644
--- a/doc/reference/evolution-shell/Makefile.am
+++ b/doc/reference/evolution-shell/Makefile.am
@@ -22,7 +22,6 @@ GTKDOC_CFLAGS= \
-I$(top_builddir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
GTKDOC_LIBS= \
@@ -31,7 +30,6 @@ GTKDOC_LIBS= \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/doc/reference/evolution-util/Makefile.am b/doc/reference/evolution-util/Makefile.am
index a7055a4..b4727b7 100644
--- a/doc/reference/evolution-util/Makefile.am
+++ b/doc/reference/evolution-util/Makefile.am
@@ -52,14 +52,12 @@ GTKDOC_CFLAGS = \
-I$(top_builddir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
GTKDOC_LIBS = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
# Extra options to supply to gtkdoc-mkdb
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index d9ce4d3..091d6e2 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -101,7 +101,6 @@ libevolution_util_la_CPPFLAGS = \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(GEO_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(NULL)
@@ -646,7 +645,6 @@ libevolution_util_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(GEO_LIBS) \
- $(GTKHTML_LIBS) \
$(ENCHANT_LIBS) \
$(INTLLIBS) \
$(MATH_LIB) \
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index 69da12d..e919169 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -52,8 +52,8 @@ libevolution_mail_formatter_la_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LIBSOUP_CFLAGS)
+ $(LIBSOUP_CFLAGS) \
+ $(NULL)
if ENABLE_SMIME
SMIME_EXTENSIONS = e-mail-parser-application-smime.c
@@ -138,9 +138,9 @@ libevolution_mail_formatter_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(LIBSOUP_LIBS) \
- $(SMIME_LIBS)
+ $(SMIME_LIBS) \
+ $(NULL)
BUILT_SOURCES = \
$(ENUM_GENERATED) \
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 15d12c6..46c6309 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -24,7 +24,6 @@ libemail_engine_la_CPPFLAGS = \
-DLIBEMAIL_ENGINE_COMPILATION \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(NULL)
@@ -80,7 +79,6 @@ libemail_engine_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 8a011df..dc81b4f 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -46,8 +46,8 @@ libevolution_mail_la_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(CERT_UI_CFLAGS) \
$(CANBERRA_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LIBSOUP_CFLAGS)
+ $(LIBSOUP_CFLAGS) \
+ $(NULL)
mailinclude_HEADERS = \
e-http-request.h \
@@ -221,7 +221,6 @@ libevolution_mail_la_LIBADD = \
$(GNOME_PLATFORM_LIBS) \
$(CERT_UI_LIBS) \
$(CANBERRA_LIBS) \
- $(GTKHTML_LIBS) \
$(SMIME_LIBS) \
$(LIBSOUP_LIBS) \
$(NULL)
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 540a7f8..2eae136 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -9,7 +9,7 @@ libevolution_mail_importers_la_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
libevolution_mail_importers_la_SOURCES = \
mail-importer.c \
@@ -27,6 +27,6 @@ libevolution_mail_importers_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index f30a752..0ce1ffb 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -19,8 +19,8 @@ module_addressbook_la_CPPFLAGS = \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LDAP_CFLAGS)
+ $(LDAP_CFLAGS) \
+ $(NULL)
module_addressbook_la_SOURCES = \
evolution-module-addressbook.c \
@@ -63,8 +63,8 @@ module_addressbook_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(CHAMPLAIN_LIBS) \
- $(GTKHTML_LIBS) \
- $(LDAP_LIBS)
+ $(LDAP_LIBS) \
+ $(NULL)
module_addressbook_la_LDFLAGS = \
diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am
index 12f331b..c9ebb7c 100644
--- a/modules/backup-restore/Makefile.am
+++ b/modules/backup-restore/Makefile.am
@@ -14,7 +14,6 @@ module_backup_restore_la_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
module_backup_restore_la_SOURCES = \
@@ -32,7 +31,6 @@ module_backup_restore_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
module_backup_restore_la_LDFLAGS = \
@@ -52,7 +50,6 @@ evolution_backup_CPPFLAGS = \
-DDBUS_SERVICES_DIR=\"'${datadir}'/dbus-1/services\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
evolution_backup_SOURCES = \
@@ -63,7 +60,6 @@ evolution_backup_LDADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
if OS_WIN32
diff --git a/modules/book-config-google/Makefile.am b/modules/book-config-google/Makefile.am
index 387af00..d891db3 100644
--- a/modules/book-config-google/Makefile.am
+++ b/modules/book-config-google/Makefile.am
@@ -6,7 +6,7 @@ module_book_config_google_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-google\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_book_config_google_la_SOURCES = \
evolution-book-config-google.c
@@ -15,7 +15,7 @@ module_book_config_google_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_book_config_google_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am
index 16086ca..c9e50c2 100644
--- a/modules/book-config-ldap/Makefile.am
+++ b/modules/book-config-ldap/Makefile.am
@@ -6,8 +6,8 @@ module_book_config_ldap_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-ldap\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LDAP_CFLAGS)
+ $(LDAP_CFLAGS) \
+ $(NULL)
module_book_config_ldap_la_SOURCES = \
evolution-book-config-ldap.c \
@@ -18,8 +18,8 @@ module_book_config_ldap_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(LDAP_LIBS)
+ $(LDAP_LIBS) \
+ $(NULL)
module_book_config_ldap_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/book-config-local/Makefile.am b/modules/book-config-local/Makefile.am
index 392582f..7c93c5b 100644
--- a/modules/book-config-local/Makefile.am
+++ b/modules/book-config-local/Makefile.am
@@ -6,7 +6,7 @@ module_book_config_local_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-local\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_book_config_local_la_SOURCES = \
evolution-book-config-local.c
@@ -15,7 +15,7 @@ module_book_config_local_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_book_config_local_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/book-config-webdav/Makefile.am b/modules/book-config-webdav/Makefile.am
index 8124b9b..58f0083 100644
--- a/modules/book-config-webdav/Makefile.am
+++ b/modules/book-config-webdav/Makefile.am
@@ -6,7 +6,7 @@ module_book_config_webdav_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-book-config-webdav\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_book_config_webdav_la_SOURCES = \
evolution-book-config-webdav.c
@@ -15,7 +15,7 @@ module_book_config_webdav_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_book_config_webdav_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/cal-config-caldav/Makefile.am b/modules/cal-config-caldav/Makefile.am
index 2a5133f..d901328 100644
--- a/modules/cal-config-caldav/Makefile.am
+++ b/modules/cal-config-caldav/Makefile.am
@@ -6,8 +6,8 @@ module_cal_config_caldav_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-caldav\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LIBSOUP_CFLAGS)
+ $(LIBSOUP_CFLAGS) \
+ $(NULL)
module_cal_config_caldav_la_SOURCES = \
evolution-cal-config-caldav.c \
@@ -20,8 +20,8 @@ module_cal_config_caldav_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(LIBSOUP_LIBS)
+ $(LIBSOUP_LIBS) \
+ $(NULL)
module_cal_config_caldav_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am
index 6ece84f..02bfbc7 100644
--- a/modules/cal-config-contacts/Makefile.am
+++ b/modules/cal-config-contacts/Makefile.am
@@ -6,7 +6,7 @@ module_cal_config_contacts_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-contacts\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_cal_config_contacts_la_SOURCES = \
evolution-cal-config-contacts.c \
@@ -19,7 +19,7 @@ module_cal_config_contacts_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_cal_config_contacts_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am
index b8c380a..8c92f04 100644
--- a/modules/cal-config-google/Makefile.am
+++ b/modules/cal-config-google/Makefile.am
@@ -6,8 +6,8 @@ module_cal_config_google_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-google\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(GDATA_CFLAGS)
+ $(GDATA_CFLAGS) \
+ $(NULL)
module_cal_config_google_la_SOURCES = \
evolution-cal-config-google.c \
@@ -22,8 +22,8 @@ module_cal_config_google_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(GDATA_LIBS)
+ $(GDATA_LIBS) \
+ $(NULL)
module_cal_config_google_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am
index 9fd3f43..8cb30c7 100644
--- a/modules/cal-config-local/Makefile.am
+++ b/modules/cal-config-local/Makefile.am
@@ -6,7 +6,7 @@ module_cal_config_local_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-local\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_cal_config_local_la_SOURCES = \
evolution-cal-config-local.c \
@@ -17,7 +17,7 @@ module_cal_config_local_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_cal_config_local_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am
index 53d8824..ad5b1fb 100644
--- a/modules/cal-config-weather/Makefile.am
+++ b/modules/cal-config-weather/Makefile.am
@@ -6,8 +6,8 @@ module_cal_config_weather_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-weather\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(GWEATHER_CFLAGS)
+ $(GWEATHER_CFLAGS) \
+ $(NULL)
module_cal_config_weather_la_SOURCES = \
evolution-cal-config-weather.c \
@@ -18,8 +18,8 @@ module_cal_config_weather_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(GWEATHER_LIBS)
+ $(GWEATHER_LIBS) \
+ $(NULL)
module_cal_config_weather_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am
index f517183..61245d9 100644
--- a/modules/cal-config-webcal/Makefile.am
+++ b/modules/cal-config-webcal/Makefile.am
@@ -6,7 +6,7 @@ module_cal_config_webcal_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-cal-config-webcal\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_cal_config_webcal_la_SOURCES = \
evolution-cal-config-webcal.c
@@ -15,7 +15,7 @@ module_cal_config_webcal_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_cal_config_webcal_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 8422fb1..496f395 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -9,7 +9,7 @@ module_calendar_la_CPPFLAGS = \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_calendar_la_SOURCES = \
evolution-module-calendar.c \
@@ -76,7 +76,7 @@ module_calendar_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_calendar_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 8bd99b5..39026b5 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -3,12 +3,20 @@ NULL =
module_LTLIBRARIES = module-composer-autosave.la
module_composer_autosave_la_CPPFLAGS = \
+<<<<<<< HEAD
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"evolution-composer-autosave\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(GTKHTML_CFLAGS) \
+=======
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -DG_LOG_DOMAIN=\"evolution-composer-autosave\" \
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS) \
+>>>>>>> Drop GtkHTML dependency.
$(NULL)
module_composer_autosave_la_SOURCES = \
@@ -22,12 +30,11 @@ module_composer_autosave_la_SOURCES = \
$(NULL)
module_composer_autosave_la_LIBADD = \
- $(top_builddir)/shell/libevolution-shell.la \
- $(top_builddir)/composer/libevolution-mail-composer.la \
- $(top_builddir)/e-util/libevolution-util.la \
- $(EVOLUTION_DATA_SERVER_LIBS) \
- $(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
+ $(top_builddir)/shell/libevolution-shell.la \
+ $(top_builddir)/composer/libevolution-mail-composer.la \
+ $(top_builddir)/e-util/libevolution-util.la \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
$(NULL)
module_composer_autosave_la_LDFLAGS = \
diff --git a/modules/contact-photos/Makefile.am b/modules/contact-photos/Makefile.am
index d25aac8..459320f 100644
--- a/modules/contact-photos/Makefile.am
+++ b/modules/contact-photos/Makefile.am
@@ -6,7 +6,6 @@ module_contact_photos_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-contact-photos\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
module_contact_photos_la_SOURCES = \
@@ -21,7 +20,6 @@ module_contact_photos_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
module_contact_photos_la_LDFLAGS = \
diff --git a/modules/gravatar/Makefile.am b/modules/gravatar/Makefile.am
index fe29264..dfdd283 100644
--- a/modules/gravatar/Makefile.am
+++ b/modules/gravatar/Makefile.am
@@ -6,7 +6,6 @@ module_gravatar_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-gravatar\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
module_gravatar_la_SOURCES = \
@@ -21,7 +20,6 @@ module_gravatar_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
module_gravatar_la_LDFLAGS = \
diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am
index b38989d..db7f1b8 100644
--- a/modules/itip-formatter/Makefile.am
+++ b/modules/itip-formatter/Makefile.am
@@ -11,7 +11,7 @@ module_itip_formatter_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-itip-formatter\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_itip_formatter_la_SOURCES = \
e-conflict-search-selector.c \
@@ -37,7 +37,7 @@ module_itip_formatter_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_itip_formatter_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am
index c4969a7..affd910 100644
--- a/modules/itip-formatter/plugin/Makefile.am
+++ b/modules/itip-formatter/plugin/Makefile.am
@@ -10,7 +10,7 @@ liborg_gnome_itip_formatter_la_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_itip_formatter_la_SOURCES = \
config-ui.c \
@@ -29,7 +29,7 @@ liborg_gnome_itip_formatter_la_LIBADD = \
$(top_builddir)/em-format/libevolution-mail-formatter.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
BUILT_SOURCES = $(plugin_DATA)
diff --git a/modules/mail-config/Makefile.am b/modules/mail-config/Makefile.am
index 2d6eb41..2d05b7d 100644
--- a/modules/mail-config/Makefile.am
+++ b/modules/mail-config/Makefile.am
@@ -8,7 +8,6 @@ module_mail_config_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-mail-config\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
module_mail_config_la_SOURCES = \
@@ -31,7 +30,6 @@ module_mail_config_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
module_mail_config_la_LDFLAGS = \
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 0ae18df..bd4d615 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -9,7 +9,7 @@ module_mail_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-mail\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_mail_la_SOURCES = \
evolution-module-mail.c \
@@ -50,7 +50,7 @@ module_mail_la_LIBADD = \
$(libevolution_mail_settings_la) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_mail_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index be42894..fe7dbcf 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -6,7 +6,7 @@ module_mailto_handler_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-mailto-handler\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_mailto_handler_la_SOURCES = \
evolution-mailto-handler.c
@@ -16,7 +16,7 @@ module_mailto_handler_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_mailto_handler_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am
index 4934992..f08fb75 100644
--- a/modules/mdn/Makefile.am
+++ b/modules/mdn/Makefile.am
@@ -6,7 +6,7 @@ module_mdn_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-mdn\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_mdn_la_SOURCES = \
evolution-mdn.c
@@ -18,7 +18,7 @@ module_mdn_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_mdn_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
index cc8c1e7..123aea8 100644
--- a/modules/offline-alert/Makefile.am
+++ b/modules/offline-alert/Makefile.am
@@ -6,7 +6,7 @@ module_offline_alert_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-offline-alert\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_offline_alert_la_SOURCES = \
evolution-offline-alert.c
@@ -16,7 +16,7 @@ module_offline_alert_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_offline_alert_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index c7d97b9..d01f493 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -7,7 +7,7 @@ module_plugin_lib_la_CPPFLAGS = \
-DEVOLUTION_PREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_plugin_lib_la_SOURCES = \
evolution-module-plugin-lib.c \
@@ -18,7 +18,7 @@ module_plugin_lib_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_plugin_lib_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am
index 3a594bb..be8fc9f 100644
--- a/modules/plugin-manager/Makefile.am
+++ b/modules/plugin-manager/Makefile.am
@@ -6,7 +6,7 @@ module_plugin_manager_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-plugin-manager\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_plugin_manager_la_SOURCES = \
evolution-plugin-manager.c
@@ -16,7 +16,7 @@ module_plugin_manager_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_plugin_manager_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am
index d48a445..6dcfeac 100644
--- a/modules/prefer-plain/Makefile.am
+++ b/modules/prefer-plain/Makefile.am
@@ -9,7 +9,7 @@ module_prefer_plain_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-prefer-plain\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_prefer_plain_la_SOURCES = \
e-mail-parser-prefer-plain.c \
@@ -25,7 +25,7 @@ module_prefer_plain_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_prefer_plain_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/prefer-plain/plugin/Makefile.am b/modules/prefer-plain/plugin/Makefile.am
index 177da17..7fddc34 100644
--- a/modules/prefer-plain/plugin/Makefile.am
+++ b/modules/prefer-plain/plugin/Makefile.am
@@ -9,7 +9,7 @@ liborg_gnome_prefer_plain_la_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_prefer_plain_la_SOURCES = \
config-ui.c
@@ -19,7 +19,7 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_prefer_plain_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
BUILT_SOURCES = $(plugin_DATA)
diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index 81ed4eb..80c7199 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -8,7 +8,6 @@ module_settings_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-settings\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
module_settings_la_SOURCES = \
@@ -62,7 +61,6 @@ module_settings_la_LIBADD = \
$(top_builddir)/calendar/gui/libevolution-calendar.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
module_settings_la_LDFLAGS = \
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index 5cd36bb..e6cc76c 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -6,7 +6,7 @@ module_spamassassin_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-spamassassin\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_spamassassin_la_SOURCES = \
evolution-spamassassin.c
@@ -18,7 +18,7 @@ module_spamassassin_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_spamassassin_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 7700fb8..ad9ae5c 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -8,7 +8,6 @@ module_startup_wizard_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-startup-wizard\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
$(NULL)
module_startup_wizard_la_SOURCES = \
@@ -30,7 +29,6 @@ module_startup_wizard_la_LIBADD = \
$(libevolution_mail_settings_la) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
$(NULL)
module_startup_wizard_la_LDFLAGS = \
diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am
index ad9c9ef..ae27e49 100644
--- a/modules/text-highlight/Makefile.am
+++ b/modules/text-highlight/Makefile.am
@@ -7,7 +7,7 @@ module_text_highlight_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-text-highlight\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_text_highlight_la_SOURCES = \
e-mail-display-popup-text-highlight.c \
@@ -27,7 +27,7 @@ module_text_highlight_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_text_highlight_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/tnef-attachment/Makefile.am b/modules/tnef-attachment/Makefile.am
index 21f3988..9d81539 100644
--- a/modules/tnef-attachment/Makefile.am
+++ b/modules/tnef-attachment/Makefile.am
@@ -13,8 +13,8 @@ module_tnef_attachment_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-tnef-attachment\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(TNEF_CFLAGS)
+ $(TNEF_CFLAGS) \
+ $(NULL)
module_tnef_attachment_la_SOURCES = \
e-mail-parser-tnef-attachment.c \
@@ -26,8 +26,8 @@ module_tnef_attachment_la_LIBADD = \
$(top_builddir)/em-format/libevolution-mail-formatter.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- -lytnef
+ -lytnef \
+ $(NULL)
module_tnef_attachment_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am
index cc7627d..ddbd220 100644
--- a/modules/vcard-inline/Makefile.am
+++ b/modules/vcard-inline/Makefile.am
@@ -7,7 +7,7 @@ module_vcard_inline_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-module-vcard-inline\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_vcard_inline_la_SOURCES = \
e-mail-formatter-vcard.c \
@@ -26,7 +26,7 @@ module_vcard_inline_la_LIBADD = \
$(top_builddir)/addressbook/printing/libecontactprint.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_vcard_inline_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am
index 985e483..a518364 100644
--- a/modules/web-inspector/Makefile.am
+++ b/modules/web-inspector/Makefile.am
@@ -6,7 +6,7 @@ module_web_inspector_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-web-inspector\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
module_web_inspector_la_SOURCES = \
evolution-web-inspector.c
@@ -15,7 +15,7 @@ module_web_inspector_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
module_web_inspector_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index e4a7d99..1466ad3 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -16,7 +16,7 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \
-DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c
@@ -31,7 +31,7 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \
org-gnome-attachment-reminder.error.xml
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 3248bbb..7d06ca3 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -17,7 +17,7 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS = \
-I$(top_srcdir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
@@ -31,7 +31,7 @@ liborg_gnome_evolution_bbdb_la_LIBADD = \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am
index 3f0d5cf..07c90fa 100644
--- a/plugins/dbx-import/Makefile.am
+++ b/plugins/dbx-import/Makefile.am
@@ -16,7 +16,7 @@ liborg_gnome_dbx_import_la_CPPFLAGS = \
-I$(top_builddir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c
@@ -29,7 +29,7 @@ liborg_gnome_dbx_import_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = org-gnome-dbx-import.eplug.xml
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 178d1a1..e5b2955 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -12,7 +12,7 @@ liborg_gnome_email_custom_header_la_CPPFLAGS = \
-I$(top_builddir)/composer \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_email_custom_header_la_SOURCES = \
email-custom-header.c \
@@ -24,7 +24,7 @@ liborg_gnome_email_custom_header_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 90d8655..3341c6e 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -28,7 +28,7 @@ liborg_gnome_external_editor_la_CPPFLAGS = \
-I$(top_srcdir)/composer \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_external_editor_la_SOURCES = \
external-editor.c
@@ -44,7 +44,7 @@ liborg_gnome_external_editor_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = \
org-gnome-external-editor.eplug.xml \
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index 45bbbd5..005bcde 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -12,7 +12,7 @@ liborg_gnome_face_la_CPPFLAGS = \
-I$(top_builddir)/composer \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_face_la_SOURCES = face.c
@@ -22,7 +22,7 @@ liborg_gnome_face_la_LIBADD = \
$(top_builddir)/mail/libevolution-mail.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 2b5fef0..f6d1f75 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -18,7 +18,7 @@ liborg_gnome_mail_notification_la_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(CANBERRA_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
@@ -33,7 +33,7 @@ liborg_gnome_mail_notification_la_LIBADD = \
$(GNOME_PLATFORM_LIBS) \
$(LIBNOTIFY_LIBS) \
$(CANBERRA_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
BUILT_SOURCES = $(plugin_DATA)
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index c6b7c0e..cd3557e 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -9,7 +9,7 @@ liborg_gnome_mail_to_task_la_CPPFLAGS = \
-I$(top_srcdir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
@@ -24,7 +24,7 @@ liborg_gnome_mail_to_task_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = org-gnome-mail-to-task.eplug.xml
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 2da8d9b..81846a6 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -9,7 +9,7 @@ liborg_gnome_mailing_list_actions_la_CPPFLAGS = \
-I$(top_builddir)/composer \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
@@ -23,7 +23,7 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
error_DATA = org-gnome-mailing-list-actions.error
errordir = $(privdatadir)/errors
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 675968e..52c6582 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -17,8 +17,8 @@ liborg_gnome_pst_import_la_CPPFLAGS = \
-I$(top_builddir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LIBPST_CFLAGS)
+ $(LIBPST_CFLAGS) \
+ $(NULL)
liborg_gnome_pst_import_la_SOURCES = pst-importer.c
@@ -31,8 +31,8 @@ liborg_gnome_pst_import_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(LIBPST_LIBS)
+ $(LIBPST_LIBS) \
+ $(NULL)
EXTRA_DIST = org-gnome-pst-import.eplug.xml
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index cb7540b..8b9344f 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -16,8 +16,8 @@ liborg_gnome_publish_calendar_la_CPPFLAGS = \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(LIBNOTIFY_CFLAGS)
+ $(LIBNOTIFY_CFLAGS) \
+ $(NULL)
liborg_gnome_publish_calendar_la_SOURCES = \
publish-calendar.c \
@@ -38,8 +38,8 @@ liborg_gnome_publish_calendar_la_LIBADD = \
$(top_builddir)/calendar/gui/libevolution-calendar.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(LIBNOTIFY_LIBS)
+ $(LIBNOTIFY_LIBS) \
+ $(NULL)
EXTRA_DIST = \
org-gnome-publish-calendar.eplug.xml \
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 3bb958a..3b76828 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -9,7 +9,7 @@ liborg_gnome_save_calendar_la_CPPFLAGS = \
-I$(top_srcdir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_save_calendar_la_SOURCES = \
save-calendar.c \
@@ -24,7 +24,7 @@ liborg_gnome_save_calendar_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = org-gnome-save-calendar.eplug.xml
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index ccb3d56..a395dc8 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -11,7 +11,7 @@ liborg_gnome_templates_la_CPPFLAGS = \
-I$(top_builddir)/composer \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS)
+ $(NULL)
liborg_gnome_templates_la_SOURCES = templates.c
@@ -25,7 +25,7 @@ liborg_gnome_templates_la_LIBADD = \
$(top_builddir)/libemail-engine/libemail-engine.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS)
+ $(NULL)
EXTRA_DIST = org-gnome-templates.eplug.xml
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7d42a68..a8df140 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -61,8 +61,8 @@ libevolution_shell_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-shell\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(CLUTTER_GTK_CFLAGS)
+ $(CLUTTER_GTK_CFLAGS) \
+ $(NULL)
libevolution_shell_la_SOURCES = \
$(evolution_shell_include_HEADERS) \
@@ -121,8 +121,8 @@ evolution_CPPFLAGS = \
-DLIBDIR=\""$(datadir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(CLUTTER_GTK_CFLAGS)
+ $(CLUTTER_GTK_CFLAGS) \
+ $(NULL)
evolution_SOURCES = \
main.c \
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 15297bd..f571989 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -17,8 +17,8 @@ libevolution_smime_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(CERT_UI_CFLAGS)
+ $(CERT_UI_CFLAGS) \
+ $(NULL)
libevolution_smime_la_SOURCES = \
ca-trust-dialog.c \
@@ -39,8 +39,8 @@ libevolution_smime_la_LIBADD = \
$(top_builddir)/smime/lib/libessmime.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(CERT_UI_LIBS)
+ $(CERT_UI_LIBS) \
+ $(NULL)
libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 0bb36ce..4ef7838 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -14,8 +14,8 @@ libessmime_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(CERT_UI_CFLAGS)
+ $(CERT_UI_CFLAGS) \
+ $(NULL)
libessmime_la_SOURCES = \
e-cert.c \
@@ -31,8 +31,8 @@ libessmime_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(GTKHTML_LIBS) \
- $(CERT_UI_LIBS)
+ $(CERT_UI_LIBS) \
+ $(NULL)
libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
