aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-11-14 13:22:44 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-11-14 13:22:44 +0800
commit31ee17bdb1632d36dbb151141ea532d185c9d282 (patch)
treef319e769d11a1b1915838cd1b84dee8f6e93be65
parent8c0bd86d5fdd6d87c3170e2a01423e7c7018a981 (diff)
downloadgsoc2013-evolution-31ee17bdb1632d36dbb151141ea532d185c9d282.tar.gz
gsoc2013-evolution-31ee17bdb1632d36dbb151141ea532d185c9d282.tar.zst
gsoc2013-evolution-31ee17bdb1632d36dbb151141ea532d185c9d282.zip
More library dependency unravelling.
svn path=/branches/kill-bonobo/; revision=36783
-rw-r--r--addressbook/gui/component/Makefile.am9
-rw-r--r--calendar/gui/Makefile.am2
-rw-r--r--calendar/modules/Makefile.am8
3 files changed, 10 insertions, 9 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 0e4747f2a5..53e0a2e804 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -23,9 +23,9 @@ INCLUDES = \
$(LDAP_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-module_LTLIBRARIES = libevolution-addressbook.la
+module_LTLIBRARIES = libevolution-module-contacts.la
-libevolution_addressbook_la_SOURCES = \
+libevolution_module_contacts_la_SOURCES = \
addressbook-config.c \
addressbook-config.h \
autocompletion-config.c \
@@ -50,7 +50,7 @@ if ENABLE_SMIME
SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la
endif
-libevolution_addressbook_la_LIBADD = \
+libevolution_module_contacts_la_LIBADD = \
$(SMIME_LIB) \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/composer/libcomposer.la \
@@ -72,7 +72,8 @@ libevolution_addressbook_la_LIBADD = \
$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
-libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+libevolution_module_contacts_la_LDFLAGS = \
+ -module -avoid-version $(NO_UNDEFINED)
# GConf schemas
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index a0d15b0061..b371ec263b 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -178,6 +178,8 @@ libcal_gui_la_SOURCES = \
libcal_gui_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/composer/libcomposer.la \
+ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
diff --git a/calendar/modules/Makefile.am b/calendar/modules/Makefile.am
index 059d99fea1..4e98e416c5 100644
--- a/calendar/modules/Makefile.am
+++ b/calendar/modules/Makefile.am
@@ -68,16 +68,14 @@ libevolution_module_calendars_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/calendar/gui/libcal-gui.la \
- $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
+ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la
libevolution_module_memos_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/calendar/gui/libcal-gui.la \
- $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
+ $(top_builddir)/calendar/gui/libcal-gui.la
libevolution_module_tasks_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/calendar/gui/libcal-gui.la \
- $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
+ $(top_builddir)/calendar/gui/libcal-gui.la