[evolution/gnome-3-5-3: 7/8] itip-formatter/plugin: Can't link a module to another module.

[Matthew Barnes <mbarnes src gnome org>]

commit 9ce855f74c1ff78134f218dc9bd57e0d7dc53cfc
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jun 25 20:39:22 2012 -0400

    itip-formatter/plugin: Can't link a module to another module.
    
    Point modules/itip-formatter/plugin/Makefile.am to the source files it
    needs from the module directory.  Have to rebuild them for the plugin.
    
    (cherry picked from commit 2e7bd95699ea456f19d25bc8a574730ebd4eac27)

 modules/itip-formatter/plugin/Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am
index 3a8da2c..31c886a 100644
--- a/modules/itip-formatter/plugin/Makefile.am
+++ b/modules/itip-formatter/plugin/Makefile.am
@@ -13,7 +13,11 @@ liborg_gnome_itip_formatter_la_CPPFLAGS =		\
 	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_itip_formatter_la_SOURCES =		\
-	config-ui.c
+	config-ui.c					\
+	../e-conflict-search-selector.c			\
+	../e-conflict-search-selector.h			\
+	../e-source-conflict-search.c			\
+	../e-source-conflict-search.h
 
 liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
@@ -24,7 +28,6 @@ liborg_gnome_itip_formatter_la_LIBADD =				\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/em-format/libemformat.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/modules/itip-formatter/module-itip-formatter.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)