diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-06-03 15:41:05 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-06-03 15:41:05 +0800 |
commit | b8306eaf97e4f85b087e4c30a1f3793490d08a01 (patch) | |
tree | 733692e0e02b03ea28ad836cd897f45558695783 /addressbook | |
parent | 907d3f8a5467ac3891e8734b436b5ab6046e0e6e (diff) | |
download | gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.tar.gz gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.tar.zst gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.zip |
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
Diffstat (limited to 'addressbook')
-rw-r--r-- | addressbook/ChangeLog | 5 | ||||
-rw-r--r-- | addressbook/backend/ebook/Makefile.am | 6 |
2 files changed, 8 insertions, 3 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 |