diff options
Diffstat (limited to 'modules/prefer-plain')
| -rw-r--r-- | modules/prefer-plain/Makefile.am | 11 | ||||
| -rw-r--r-- | modules/prefer-plain/plugin/Makefile.am | 9 | ||||
| -rw-r--r-- | modules/prefer-plain/plugin/config-ui.c | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am index ac471dfcbd..1b0289ec9e 100644 --- a/modules/prefer-plain/Makefile.am +++ b/modules/prefer-plain/Makefile.am @@ -5,11 +5,12 @@ module_LTLIBRARIES = module-prefer-plain.la module_prefer_plain_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DG_LOG_DOMAIN=\"evolution-module-prefer-plain\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_prefer_plain_la_SOURCES = \ e-mail-parser-prefer-plain.c \ @@ -19,12 +20,14 @@ module_prefer_plain_la_SOURCES = \ evolution-module-prefer-plain.c module_prefer_plain_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) 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 d1064cb352..255b914646 100644 --- a/modules/prefer-plain/plugin/Makefile.am +++ b/modules/prefer-plain/plugin/Makefile.am @@ -6,10 +6,11 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la liborg_gnome_prefer_plain_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_prefer_plain_la_SOURCES = \ config-ui.c @@ -18,7 +19,9 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_prefer_plain_la_LIBADD = \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) BUILT_SOURCES = $(plugin_DATA) diff --git a/modules/prefer-plain/plugin/config-ui.c b/modules/prefer-plain/plugin/config-ui.c index 411ef24dbd..5ed58914d3 100644 --- a/modules/prefer-plain/plugin/config-ui.c +++ b/modules/prefer-plain/plugin/config-ui.c @@ -23,8 +23,6 @@ #include <mail/em-config.h> -#include <libedataserverui/libedataserverui.h> - GtkWidget *prefer_plain_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); enum { |