From b8306eaf97e4f85b087e4c30a1f3793490d08a01 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 3 Jun 2001 07:41:05 +0000 Subject: 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 --- wombat/ChangeLog | 4 ++++ wombat/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'wombat') 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 + + * Makefile.am (wombat_LDADD): Move `$(DB3_LDADD)' before libeutil. + 2001-05-31 Christopher James Lahey * 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) -- cgit v1.2.3