aboutsummaryrefslogtreecommitdiffstats
path: root/importers
diff options
context:
space:
mode:
Diffstat (limited to 'importers')
-rw-r--r--importers/ChangeLog10
-rw-r--r--importers/Makefile.am4
2 files changed, 12 insertions, 2 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog
index 2f19a88e1d..c64a10b718 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,13 @@
+2001-06-04 Ettore Perazzoli <ettore@ximian.com>
+
+ Fix Radek's fix. $(DB3_LDADD) must always come *before*
+ `libeutil.la'.
+
+ * Makefile.am (evolution_netscape_importer_LDADD): Move
+ `libevolution-importer.la' on top, then put `$(DB3_LDADD)', then
+ libeutil.la, then the Bonobo and GNOME libs.
+ (evolution_elm_importer_LDADD): Likewise.
+
2001-06-04 Radek Doulik <rodo@ximian.com>
* Makefile.am: move DB3_LDADD down to fix linkage
diff --git a/importers/Makefile.am b/importers/Makefile.am
index 7211da69b4..3c59be44a3 100644
--- a/importers/Makefile.am
+++ b/importers/Makefile.am
@@ -30,9 +30,9 @@ evolution_netscape_importer_SOURCES = \
netscape-importer.c
evolution_netscape_importer_LDADD = \
- $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(DB3_LDADD) \
+ $(top_builddir)/e-util/libeutil.la \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS)
@@ -40,9 +40,9 @@ evolution_elm_importer_SOURCES = \
elm-importer.c
evolution_elm_importer_LDADD = \
- $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(DB3_LDADD) \
+ $(top_builddir)/e-util/libeutil.la \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS)