On Mon, 2010-03-15 at 19:17 -0400, Matthew Barnes wrote:
> On Mon, 2010-03-15 at 18:25 -0400, Paul Smith wrote:
> > Hi Matt; where were they committed?  I pulled the latest git HEAD and I
> > don't see these changes... see my previous email (sorry I posted without
> > reading this but my Evo has been offline so I could rebuild it :-p :-))
> > 
> > Maybe they went onto a branch or something?  I'm no git expert so I'm
> > not sure how to check this.  Does everyone else see this change?
> 
> Bah, I fixed the wrong Makefile.am.  Try it again.
> 
> http://git.gnome.org/browse/evolution/commit/?id=ab9d256343093b6dc7002c4242230c241dc3a353

Better, but still fails later on in evolution/capplet directory itself.

Adding this patch allows all to work:

diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index 51e17dc..196f62a 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -59,5 +59,6 @@ evolution_settings_LDADD =                            \
        $(top_builddir)/widgets/misc/libemiscwidgets.la \
        $(top_builddir)/filter/libfilter.la             \
        $(top_builddir)/mail/libevolution-mail.la       \
-       $(top_builddir)/capplet/settings/libevolution-mail-settings.la
-
+       $(top_builddir)/capplet/settings/libevolution-mail-settings.la  \
+       $(top_builddir)/shell/libeshell.la              \
+       $(top_builddir)/e-util/libeutil.la


_______________________________________________
Evolution-hackers mailing list
Evolution-hackers@gnome.org
http://mail.gnome.org/mailman/listinfo/evolution-hackers

Reply via email to