From 85b2913a380c69f14ae0254ad23b10fabfb33667 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 24 Oct 2008 23:52:05 +0000 Subject: Merge revisions 36534:36684 from trunk. svn path=/branches/kill-bonobo/; revision=36685 --- plugins/mono/ChangeLog | 8 ++++++++ plugins/mono/Makefile.am | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'plugins/mono') diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog index a78216273d..ff07e79a0b 100644 --- a/plugins/mono/ChangeLog +++ b/plugins/mono/ChangeLog @@ -1,3 +1,11 @@ +2008-10-22 Matthew Barnes + + ** Fixes part of bug #549025 + + * Makefile.am: + Add $(MONO_CFLAGS) and $(MONO_LIBS) explicitly. The mono plugin + is the only module that should be linking against libmono. + 2008-09-02 Sankar P License Changes diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am index 680fd7a096..aa20b100e3 100644 --- a/plugins/mono/Makefile.am +++ b/plugins/mono/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) + $(E_UTIL_CFLAGS) \ + $(MONO_CFLAGS) @EVO_PLUGIN_RULE@ @@ -10,7 +11,8 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version liborg_gnome_evolution_mono_la_LIBADD = \ - $(E_UTIL_LIBS) + $(E_UTIL_LIBS) \ + $(MONO_LIBS) EXTRA_DIST = org-gnome-evolution-mono.eplug.xml -- cgit v1.2.3