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 /shell | |
| parent | 907d3f8a5467ac3891e8734b436b5ab6046e0e6e (diff) | |
| download | gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.tar gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.tar.gz gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.tar.bz2 gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.tar.lz gsoc2013-evolution-b8306eaf97e4f85b087e4c30a1f3793490d08a01.tar.xz 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 'shell')
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/Makefile.am | 4 |
2 files changed, 7 insertions, 2 deletions
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 |