aboutsummaryrefslogtreecommitdiffstats
path: root/executive-summary
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-06-03 15:41:05 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-06-03 15:41:05 +0800
commitb8306eaf97e4f85b087e4c30a1f3793490d08a01 (patch)
tree733692e0e02b03ea28ad836cd897f45558695783 /executive-summary
parent907d3f8a5467ac3891e8734b436b5ab6046e0e6e (diff)
downloadgsoc2013-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 'executive-summary')
-rw-r--r--executive-summary/ChangeLog8
-rw-r--r--executive-summary/component/Makefile.am4
-rw-r--r--executive-summary/test-service/Makefile.am4
3 files changed, 12 insertions, 4 deletions
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 598805f1a0..69846b196a 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-03 Ettore Perazzoli <ettore@ximian.com>
+
+ * test-service/Makefile.am (rdf_summary_LDADD): Move
+ `$(DB3_LDADD)' before the shared libraries.
+
+ * component/Makefile.am (evolution_executive_summary_LDADD): Move
+ `$(DB3_LDADD)' before libeutil.
+
2001-06-01 Ettore Perazzoli <ettore@ximian.com>
* component/Makefile.am (evolution_executive_summary_LDADD): Add
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 8bd8789d3b..434bddf0cd 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -57,6 +57,7 @@ evolution_executive_summary_SOURCES = \
main.c
evolution_executive_summary_LDADD = \
+ $(DB3_LDADD) \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
@@ -64,8 +65,7 @@ evolution_executive_summary_LDADD = \
$(BONOBO_VFS_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
-lgal \
- $(GTKHTML_LIBS) \
- $(DB3_LDADD)
+ $(GTKHTML_LIBS)
gladedir = $(datadir)/evolution/glade
glade_DATA = executive-summary-config.glade
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
index 3b00e92fb3..716f7185bb 100644
--- a/executive-summary/test-service/Makefile.am
+++ b/executive-summary/test-service/Makefile.am
@@ -30,9 +30,9 @@ rdf_summary_SOURCES = \
rdf_summary_LDADD = \
$(top_builddir)/executive-summary/evolution-services/libevolution-services.la \
+ $(DB3_LDADD) \
$(BONOBO_VFS_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
- $(DB3_LDADD)
+ $(EXTRA_GNOME_LIBS)
oafdir = $(datadir)/oaf
oaf_in_files = \