aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-06-03 15:50:39 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-06-03 15:50:39 +0800
commit9669aebe859441b65258adcc3f2a6819f7903875 (patch)
tree77179419c942c597ace1f178cd7d25fd8d59177e
parentb8306eaf97e4f85b087e4c30a1f3793490d08a01 (diff)
downloadgsoc2013-evolution-9669aebe859441b65258adcc3f2a6819f7903875.tar
gsoc2013-evolution-9669aebe859441b65258adcc3f2a6819f7903875.tar.gz
gsoc2013-evolution-9669aebe859441b65258adcc3f2a6819f7903875.tar.bz2
gsoc2013-evolution-9669aebe859441b65258adcc3f2a6819f7903875.tar.lz
gsoc2013-evolution-9669aebe859441b65258adcc3f2a6819f7903875.tar.xz
gsoc2013-evolution-9669aebe859441b65258adcc3f2a6819f7903875.tar.zst
gsoc2013-evolution-9669aebe859441b65258adcc3f2a6819f7903875.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=10106
-rw-r--r--importers/ChangeLog9
-rw-r--r--importers/Makefile.am52
2 files changed, 35 insertions, 26 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog
index cd9c99b76f..e0870d05ed 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-03 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am (evolution_netscape_importer_LDADD): Move
+ `$(DB3_LDADD)' before libeutil, and the shared libraries at the
+ bottom.
+ (evolution_elm_importer_LDADD): Likewise.
+ (evolution_pine_importer_LDADD): Likewise.
+ (evolution_gnomecard_importer_LDADD): Likewise.
+
2001-06-01 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (evolution_netscape_importer_LDADD): Add
diff --git a/importers/Makefile.am b/importers/Makefile.am
index cbb5586084..fca406f78a 100644
--- a/importers/Makefile.am
+++ b/importers/Makefile.am
@@ -29,48 +29,48 @@ evolution_netscape_importer_SOURCES = \
$(MAIL_GENERATED) \
netscape-importer.c
-evolution_netscape_importer_LDADD = \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
- $(top_builddir)/e-util/libeutil.la \
+evolution_netscape_importer_LDADD = \
+ $(DB3_LDADD) \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
- $(DB3_LDADD)
+ $(BONOBO_GNOME_LIBS) \
+ $(EXTRA_GNOME_LIBS)
evolution_elm_importer_SOURCES = \
elm-importer.c
-evolution_elm_importer_LDADD = \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
- $(top_builddir)/e-util/libeutil.la \
+evolution_elm_importer_LDADD = \
+ $(DB3_LDADD) \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
- $(DB3_LDADD)
+ $(BONOBO_GNOME_LIBS) \
+ $(EXTRA_GNOME_LIBS)
evolution_pine_importer_SOURCES = \
pine-importer.c
-evolution_pine_importer_LDADD = \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.la \
+evolution_pine_importer_LDADD = \
$(top_builddir)/shell/importer/libevolution-importer.la \
- $(DB3_LDADD)
+ $(DB3_LDADD) \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/ename/libename.la \
+ $(top_builddir)/libversit/libversit.la \
+ $(BONOBO_GNOME_LIBS) \
+ $(EXTRA_GNOME_LIBS)
evolution_gnomecard_importer_SOURCES = \
evolution-gnomecard-importer.c
-evolution_gnomecard_importer_LDADD = \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.la \
+evolution_gnomecard_importer_LDADD = \
$(top_builddir)/shell/importer/libevolution-importer.la \
- $(DB3_LDADD)
+ $(DB3_LDADD) \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/ename/libename.la \
+ $(top_builddir)/libversit/libversit.la \
+ $(BONOBO_GNOME_LIBS) \
+ $(EXTRA_GNOME_LIBS)
oafdir = $(datadir)/oaf
oaf_in_files = GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in \