evolution r36783 - in branches/kill-bonobo: addressbook/gui/component calendar/gui calendar/modules

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Nov 14 05:22:44 2008
New Revision: 36783
URL: http://svn.gnome.org/viewvc/evolution?rev=36783&view=rev

Log:
More library dependency unravelling.


Modified:
   branches/kill-bonobo/addressbook/gui/component/Makefile.am
   branches/kill-bonobo/calendar/gui/Makefile.am
   branches/kill-bonobo/calendar/modules/Makefile.am

Modified: branches/kill-bonobo/addressbook/gui/component/Makefile.am
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/Makefile.am	(original)
+++ branches/kill-bonobo/addressbook/gui/component/Makefile.am	Fri Nov 14 05:22:44 2008
@@ -23,9 +23,9 @@
 	$(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 @@
 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 @@
 	$(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
 

Modified: branches/kill-bonobo/calendar/gui/Makefile.am
==============================================================================
--- branches/kill-bonobo/calendar/gui/Makefile.am	(original)
+++ branches/kill-bonobo/calendar/gui/Makefile.am	Fri Nov 14 05:22:44 2008
@@ -178,6 +178,8 @@
 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	\

Modified: branches/kill-bonobo/calendar/modules/Makefile.am
==============================================================================
--- branches/kill-bonobo/calendar/modules/Makefile.am	(original)
+++ branches/kill-bonobo/calendar/modules/Makefile.am	Fri Nov 14 05:22:44 2008
@@ -68,16 +68,14 @@
 	$(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