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 --- shell/ChangeLog | 5 +++++ shell/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'shell') 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 + + * Makefile.am (evolution_LDADD): Move `$(DB3_LDADD)' before + libeutil. + 2001-06-01 Ettore Perazzoli * 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 -- cgit v1.2.3