#518728: subtle link error: system libs before Evolution libs

When compiling on Debian Etch (Evolution 2.12), evolution-dataserver
was linked against /usr/lib/libebook-1.2.so.5 because of the incorrect
link order. "incorrect" in this context means "system libs" before
"Evolution libs".

svn path=/trunk/; revision=9445

diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 9670412..f78cf36 100644 (file)
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -49,9 +49,9 @@ libebook_1_2_la_SOURCES =                             \
        e-vcard.c
 
 libebook_1_2_la_LIBADD =                                       \
-       $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
        $(top_builddir)/camel/libcamel-1.2.la                   \
-       $(top_builddir)/libedataserver/libedataserver-1.2.la
+       $(top_builddir)/libedataserver/libedataserver-1.2.la    \
+       $(EVOLUTION_ADDRESSBOOK_LIBS)
 
 libebook_1_2_la_LDFLAGS =                                                      \
        -version-info $(LIBEBOOK_CURRENT):$(LIBEBOOK_REVISION):$(LIBEBOOK_AGE) $(NO_UNDEFINED)

diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index 009f8d5..2865c39 100644 (file)
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -44,11 +44,11 @@ libedata_book_1_2_la_SOURCES =                              \
        ximian-vcard.h
 
 libedata_book_1_2_la_LIBADD =                                  \
-       $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
        $(top_builddir)/addressbook/libebook/libebook-1.2.la    \
        $(top_builddir)/libedataserver/libedataserver-1.2.la    \
        $(top_builddir)/libebackend/libebackend-1.2.la  \
-       $(DB_LIBS)
+       $(DB_LIBS) \
+       $(EVOLUTION_ADDRESSBOOK_LIBS)
 
 libedata_book_1_2_la_LDFLAGS = \
        -version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE) $(NO_UNDEFINED)