Fix linking order for `$(DB3_LDADD)'s so that we avoid pulling

functions from a different Berkeley DB library when we really don't
mean to.

svn path=/trunk/; revision=10105

15 files changed, 54 insertions, 18 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index a99cac8940..c4f3f94f3a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Move
+	`$(DB3_LDADD)' before libeutil.
+
 2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
 
 	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Add
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 9dddc56cfb..86a97a1e56 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -112,11 +112,11 @@ evolution_vcard_importer_LDADD =				\
 	libebook.la						\
 	$(BONOBO_GNOME_LIBS)					\
 	$(EXTRA_GNOME_LIBS)					\
+	$(top_builddir)/shell/importer/libevolution-importer.la \
+	$(DB3_LDADD)						\
 	$(top_builddir)/e-util/ename/libename.la		\
 	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/shell/importer/libevolution-importer.la	\
-	$(DB3_LDADD)
+	$(top_builddir)/e-util/libeutil.la
 
 load_pine_addressbook_SOURCES =				\
 	load-pine-addressbook.c
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index de153e33ac..877c9e6a4b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* gui/e-itip-control.c: #include <bonobo/bonobo-context.h> instead
+	of <bonobo/bonobo-running-context.h>.
+	* gui/tasks-control-factory.c: Likewise.
+
+	* gui/Makefile.am (evolution_calendar_LDADD): Move `$(DB3_LDADD)'
+	before libeutil.
+
 2001-06-01  JP Rosevear  <jpr@ximian.com>
 
 	* gui/Makefile.am: no longer build widget-util.*, the code has
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index c079a7161c..5d48feff95 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -112,11 +112,12 @@ evolution_calendar_SOURCES =			\
 
 evolution_calendar_LDADD =								\
 	alarm-notify/libalarm.a								\
+	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
+	$(DB3_LDADD)									\
 	$(top_builddir)/shell/libeshell.la						\
 	$(top_builddir)/calendar/cal-client/libcal-client.la				\
 	$(top_builddir)/calendar/cal-util/libcal-util.la				\
 	$(top_builddir)/e-util/libeutil.la						\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
 	$(top_builddir)/libversit/libversit.la						\
 	$(top_builddir)/libical/src/libical/libical.la					\
 	$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a			\
@@ -126,8 +127,7 @@ evolution_calendar_LDADD =								\
 	$(BONOBO_HTML_GNOME_LIBS)							\
 	$(GNOME_VFS_LIBS)								\
 	$(GAL_LIBS)									\
-	$(INTLLIBS)									\
-	$(DB3_LDADD)
+	$(INTLLIBS)
 
 #evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 425155a9f4..dee4bb64e6 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -33,7 +33,7 @@
 #include <bonobo/bonobo-generic-factory.h>
 #include <bonobo/bonobo-persist-stream.h>
 #include <bonobo/bonobo-stream-client.h>
-#include <bonobo/bonobo-running-context.h>
+#include <bonobo/bonobo-context.h>
 
 #include <glade/glade.h>
 #include <ical.h>
diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c
index 2d40877cf5..0f49fa6c85 100644
--- a/calendar/gui/tasks-control-factory.c
+++ b/calendar/gui/tasks-control-factory.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-running-context.h>
+#include <bonobo/bonobo-context.h>
 
 #include <liboaf/liboaf.h>
 
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 598805f1a0..69846b196a 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* test-service/Makefile.am (rdf_summary_LDADD): Move
+	`$(DB3_LDADD)' before the shared libraries.
+
+	* component/Makefile.am (evolution_executive_summary_LDADD): Move
+	`$(DB3_LDADD)' before libeutil.
+
 2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
 
 	* component/Makefile.am (evolution_executive_summary_LDADD): Add
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 8bd8789d3b..434bddf0cd 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -57,6 +57,7 @@ evolution_executive_summary_SOURCES =		\
 	main.c
 
 evolution_executive_summary_LDADD = 							\
+	$(DB3_LDADD)									\
 	$(top_builddir)/shell/libeshell.la						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a					\
 	$(top_builddir)/e-util/libeutil.la						\
@@ -64,8 +65,7 @@ evolution_executive_summary_LDADD = 							\
 	$(BONOBO_VFS_GNOME_LIBS)							\
 	$(EXTRA_GNOME_LIBS)								\
 	-lgal										\
-	$(GTKHTML_LIBS)									\
-	$(DB3_LDADD)
+	$(GTKHTML_LIBS)
 
 gladedir = $(datadir)/evolution/glade
 glade_DATA = executive-summary-config.glade
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
index 3b00e92fb3..716f7185bb 100644
--- a/executive-summary/test-service/Makefile.am
+++ b/executive-summary/test-service/Makefile.am
@@ -30,9 +30,9 @@ rdf_summary_SOURCES =			\
 
 rdf_summary_LDADD =									\
 	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
+	$(DB3_LDADD)									\
 	$(BONOBO_VFS_GNOME_LIBS)							\
-	$(EXTRA_GNOME_LIBS)								\
-	$(DB3_LDADD)
+	$(EXTRA_GNOME_LIBS)
 
 oafdir = $(datadir)/oaf
 oaf_in_files = \
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8bdc7bb67b..c567342a3f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am (evolution_mail_LDADD): Move `$(DB3_LDADD)' before
+	libeutil.
+
 2001-06-01  Federico Mena Quintero  <federico@ximian.com>
 
 	* folder-browser.h (FolderBrowser): Added fields for the
diff --git a/mail/Makefile.am b/mail/Makefile.am
index aae0804394..f3931514ea 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -102,11 +102,12 @@ evolution_mail_SOURCES =		\
 	mail.h
 
 evolution_mail_LDADD = 					\
+	$(top_builddir)/camel/libcamel.la		\
+	$(DB3_LDADD)					\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/composer/libcomposer.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
-	$(top_builddir)/camel/libcamel.la		\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/ename/libename.la	\
@@ -115,8 +116,7 @@ evolution_mail_LDADD = 					\
 	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
 	$(top_builddir)/shell/importer/libevolution-importer.la				\
 	$(top_builddir)/widgets/menus/libmenus.la	\
-	$(MAILER_LIBS)					\
-	$(DB3_LDADD)
+	$(MAILER_LIBS)
 
 evolution_mail_LDFLAGS =				\
 	-export-dynamic
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 4712824101..09102685a9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am (evolution_LDADD): Move `$(DB3_LDADD)' before
+	libeutil.
+
 2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
 
 	* Makefile.am (evolution_LDADD): Add `$(DB3_LDADD)'.
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 746d8976b3..3aabed341a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -148,13 +148,13 @@ evolution_SOURCES =				\
 evolution_LDADD =						\
 	libeshell.la						\
 	importer/libevolution-importer.la			\
+	$(DB3_LDADD)						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a		\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(EXTRA_GNOME_LIBS)					\
 	$(GNOME_PRINT_LIBS)					\
 	$(GTKHTML_LIBS)						\
-	$(BONOBO_GNOME_LIBS)					\
-	$(DB3_LDADD)
+	$(BONOBO_GNOME_LIBS)
 
 oafdir = $(datadir)/oaf
 oaf_in_files = GNOME_Evolution_Shell.oaf.in
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index f146e26b2f..40fe8cd40b 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am (wombat_LDADD): Move `$(DB3_LDADD)' before libeutil.
+
 2001-05-31  Christopher James Lahey  <clahey@ximian.com>
 
 	* Makefile.am (wombat_LDADD): Added db3 libs.
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index be6fb7fce8..1e409bf99a 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -23,6 +23,7 @@ wombat_SOURCES = 		\
 
 wombat_LDADD =							\
 	$(top_builddir)/addressbook/backend/pas/libpas.a	\
+	$(DB3_LDADD)						\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
 	$(top_builddir)/e-util/ename/libename.la		\
 	$(top_builddir)/calendar/pcs/libpcs.a			\
@@ -31,7 +32,6 @@ wombat_LDADD =							\
 	$(top_builddir)/libversit/libversit.la			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(LDAP_LIBS)						\
-	$(DB3_LDADD)						\
 	$(EXTRA_GNOME_LIBS)					\
 	$(BONOBO_VFS_GNOME_LIBS)