GNOME.org
 

evolution-data-server r9445 - branches/gnome-2-22/addressbook/libebook branches/gnome-2-22/addressbook/libedata-book trunk/addressbook/libebook trunk/addressbook/libedata-book

Author: pohly
Date: Thu Aug 28 20:43:39 2008
New Revision: 9445
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9445&view=rev

Log:
#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".


Modified:
   branches/gnome-2-22/addressbook/libebook/Makefile.am
   branches/gnome-2-22/addressbook/libedata-book/Makefile.am
   trunk/addressbook/libebook/Makefile.am
   trunk/addressbook/libedata-book/Makefile.am

Modified: branches/gnome-2-22/addressbook/libebook/Makefile.am
==============================================================================
--- branches/gnome-2-22/addressbook/libebook/Makefile.am	(original)
+++ branches/gnome-2-22/addressbook/libebook/Makefile.am	Thu Aug 28 20:43:39 2008
@@ -49,9 +49,9 @@
 	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)

Modified: branches/gnome-2-22/addressbook/libedata-book/Makefile.am
==============================================================================
--- branches/gnome-2-22/addressbook/libedata-book/Makefile.am	(original)
+++ branches/gnome-2-22/addressbook/libedata-book/Makefile.am	Thu Aug 28 20:43:39 2008
@@ -44,10 +44,10 @@
 	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	\
-	$(DB_LIBS)
+	$(DB_LIBS)                                              \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) 
 
 libedata_book_1_2_la_LDFLAGS = \
 	-version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE) $(NO_UNDEFINED)

Modified: trunk/addressbook/libebook/Makefile.am
==============================================================================
--- trunk/addressbook/libebook/Makefile.am	(original)
+++ trunk/addressbook/libebook/Makefile.am	Thu Aug 28 20:43:39 2008
@@ -49,9 +49,9 @@
 	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)

Modified: trunk/addressbook/libedata-book/Makefile.am
==============================================================================
--- trunk/addressbook/libedata-book/Makefile.am	(original)
+++ trunk/addressbook/libedata-book/Makefile.am	Thu Aug 28 20:43:39 2008
@@ -44,11 +44,11 @@
 	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)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]