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 /calendar | |
| 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 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 6 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 2 | ||||
| -rw-r--r-- | calendar/gui/tasks-control-factory.c | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index de153e33ac..877c9e6a4b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2001-06-03 Ettore Perazzoli <ettore@ximian.com> + + * gui/e-itip-control.c: #include <bonobo/bonobo-context.h> instead + of <bonobo/bonobo-running-context.h>. + * gui/tasks-control-factory.c: Likewise. + + * gui/Makefile.am (evolution_calendar_LDADD): Move `$(DB3_LDADD)' + before libeutil. + 2001-06-01 JP Rosevear <jpr@ximian.com> * gui/Makefile.am: no longer build widget-util.*, the code has diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index c079a7161c..5d48feff95 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -112,11 +112,12 @@ evolution_calendar_SOURCES = \ evolution_calendar_LDADD = \ alarm-notify/libalarm.a \ + $(top_builddir)/executive-summary/evolution-services/libevolution-services.la \ + $(DB3_LDADD) \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/executive-summary/evolution-services/libevolution-services.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/libical/src/libical/libical.la \ $(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a \ @@ -126,8 +127,7 @@ evolution_calendar_LDADD = \ $(BONOBO_HTML_GNOME_LIBS) \ $(GNOME_VFS_LIBS) \ $(GAL_LIBS) \ - $(INTLLIBS) \ - $(DB3_LDADD) + $(INTLLIBS) #evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf` diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 425155a9f4..dee4bb64e6 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -33,7 +33,7 @@ #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-persist-stream.h> #include <bonobo/bonobo-stream-client.h> -#include <bonobo/bonobo-running-context.h> +#include <bonobo/bonobo-context.h> #include <glade/glade.h> #include <ical.h> diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c index 2d40877cf5..0f49fa6c85 100644 --- a/calendar/gui/tasks-control-factory.c +++ b/calendar/gui/tasks-control-factory.c @@ -25,7 +25,7 @@ #include <config.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-generic-factory.h> -#include <bonobo/bonobo-running-context.h> +#include <bonobo/bonobo-context.h> #include <liboaf/liboaf.h> |