aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-26 08:39:22 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-26 10:07:38 +0800
commitd85eac79693e7b7a6d35248e4aabd5aaa911cb9c (patch)
treea1a5ca975b49a1330a498f5f405640f409d71faa
parentfc108e59c38cd6143b790fd4236c58d7e5b4ee88 (diff)
downloadgsoc2013-evolution-d85eac79693e7b7a6d35248e4aabd5aaa911cb9c.tar.gz
gsoc2013-evolution-d85eac79693e7b7a6d35248e4aabd5aaa911cb9c.tar.zst
gsoc2013-evolution-d85eac79693e7b7a6d35248e4aabd5aaa911cb9c.zip
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.
-rw-r--r--modules/itip-formatter/plugin/Makefile.am7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am
index 3a8da2c618..31c886a264 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)