[evolution] Fix libevolution-mail-shared.la

[Matthew Barnes <mbarnes src gnome org>]

commit 4ba25a3b6d1fe600caa930661cbcaaf7cd342e72
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri May 29 15:06:43 2009 -0400

    Fix libevolution-mail-shared.la
    
    The shared library was being built as a libtool module instead of a
    normal libtool library, and was installed to the wrong directory.
    
    Fixing this created further automake-related problems which I had to
    hack around (see BIG NASTY AUTOMAKE HACK in the patch).  This is NOT
    a permanent solution.
    
    A better approach is to split the source code into separate
    directories, like we do in all the other components.
---
 mail/Makefile.am |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/mail/Makefile.am b/mail/Makefile.am
index edae1da..8fbac19 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -30,9 +30,8 @@ INCLUDES =						\
 	-DPREFIX=\""$(prefix)"\"			\
 	-DG_LOG_DOMAIN=\"evolution-mail\"
 
-component_LTLIBRARIES = libevolution-mail-shared.la \
-			libevolution-mail.la
-
+privsolib_LTLIBRARIES = libevolution-mail-shared.la
+component_LTLIBRARIES = libevolution-mail.la
 
 # Mail.idl
 MAIL_IDL = Evolution-Mail.idl
@@ -147,7 +146,6 @@ SMIME_LIBS = 				\
 	$(top_builddir)/smime/gui/libevolution-smime.la
 endif
 
-
 libevolution_mail_la_LIBADD =					\
 	$(top_builddir)/mail/libevolution-mail-shared.la	\
 	$(top_builddir)/e-util/libeutil.la			\
@@ -171,11 +169,11 @@ libevolution_mail_la_LIBADD =					\
 libevolution_mail_la_LDFLAGS = 			\
 	-avoid-version -module $(NO_UNDEFINED)
 
-libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
-
-# .server files
+libevolution_mail_la_DEPENDENCIES =		\
+	em-filter-i18n.h			\
+	libevolution-mail-shared.la
 
-libevolution_mail_shared_la_SOURCES =			\
+libevolution_mail_shared_la_SOURCES =		\
 	em-account-editor.c			\
 	em-account-editor.h			\
 	em-event.c				\
@@ -237,12 +235,7 @@ libevolution_mail_shared_la_SOURCES =			\
 	message-tag-followup.c			\
 	message-tag-followup.h
 
-
-
-
-
-
-libevolution_mail_shared_la_LIBADD =					\
+libevolution_mail_shared_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/composer/libcomposer.la			\
@@ -251,10 +244,29 @@ libevolution_mail_shared_la_LIBADD =					\
 	$(SMIME_LIBS)						\
 	$(THREADS_LIBS)
 
-libevolution_mail_shared_la_LDFLAGS = 			\
-	-avoid-version -module $(NO_UNDEFINED)
-
+libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED)
+
+# --- BIG NASTY AUTOMAKE HACK ---
+#
+# Automake apparently sorts Makefile.am rules alphabetically.  And
+# since component_LTLIBRARIES < privsolib_LTLIBRARIES, it tries to
+# install libevolution-mail.la before libevolution-mail-shared.la,
+# which fails when libtool tries to relink libevolution-mail.la
+# against the not-yet-installed libevolution-mail-shared.la.
+install-data-am:				\
+	install-privsolibLTLIBRARIES		\
+	install-componentLTLIBRARIES		\
+	install-data-local			\
+	install-errorDATA			\
+	install-etspecDATA			\
+	install-filterDATA			\
+	install-gladeDATA			\
+	install-idlDATA				\
+	install-mailincludeHEADERS		\
+	install-schemaDATA			\
+	install-serverDATA
 
+# .server files
 
 server_in_files = GNOME_Evolution_Mail.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)