From 214f3a8038667a7bf75c379b91a8a687095d4d05 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Mon, 9 Nov 2009 19:11:03 -0500 Subject: =?UTF-8?q?Bug=C2=A0600926=20-=20Fails=20to=20build=20due=20to=20m?= =?UTF-8?q?issing=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer/Makefile.am | 5 +---- mail/Makefile.am | 4 +++- modules/mail/Makefile.am | 4 ++++ plugins/email-custom-header/Makefile.am | 1 + plugins/groupwise-features/Makefile.am | 1 + plugins/mail-notification/Makefile.am | 2 ++ plugins/mailing-list-actions/Makefile.am | 1 + plugins/templates/Makefile.am | 1 + 8 files changed, 14 insertions(+), 5 deletions(-) diff --git a/composer/Makefile.am b/composer/Makefile.am index 8166697276..174d502b86 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -62,10 +62,7 @@ libcomposer_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(GNOME_PLATFORM_LIBS) \ - $(CAMEL_LIBS) \ - $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) + $(EVOLUTION_MAIL_LIBS) uidir = $(evolutionuidir) ui_DATA = evolution-composer.ui diff --git a/mail/Makefile.am b/mail/Makefile.am index a59061fc45..7f284e96e2 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -168,7 +168,9 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/filter/libfilter.la \ $(GNOME_PLATFORM_LIBS) \ - $(CAMEL_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ + $(CERT_UI_LIBS) \ + $(THREADS_LIBS) \ $(CANBERRA_LIBS) \ $(GTKHTML_LIBS) \ $(E_WIDGETS_LIBS) \ diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 8599a69100..d3e1ef7c2b 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -49,16 +49,20 @@ libevolution_module_mail_la_SOURCES = \ libevolution_module_mail_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/em-format/libemformat.la \ + $(top_builddir)/filter/libfilter.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/mail/importers/libevolution-mail-importers.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/filter/libfilter.la \ + $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(CAMEL_LIBS) \ $(GTKHTML_LIBS) \ diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 9e827eba8a..d38ac68230 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -23,6 +23,7 @@ liborg_gnome_email_custom_header_la_SOURCES = \ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 52e33fe5ef..5032d31689 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -50,6 +50,7 @@ liborg_gnome_groupwise_features_la_SOURCES = \ liborg_gnome_groupwise_features_la_LIBADD= \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index ddd1b5176d..1ff323baae 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -31,6 +31,8 @@ liborg_gnome_mail_notification_la_LIBADD = \ $(LIBNOTIFY_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index 87556845fe..68fcb26259 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -17,6 +17,7 @@ liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEF liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 8f47a03ef8..919103c063 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -23,6 +23,7 @@ liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(GNOME_PLATFORM_LIBS) \ -- cgit v1.2.3