From 10918b623bc7726091b84476293d83ded3e5a811 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Mon, 5 Jun 2000 15:09:10 +0000 Subject: a bunch of patches to make evolution compile with bonobo in strange prefixes. see Changelog. svn path=/trunk/; revision=3420 --- addressbook/contact-editor/Makefile.am | 6 +++--- addressbook/gui/contact-editor/Makefile.am | 6 +++--- addressbook/gui/minicard/Makefile.am | 16 ++++++++-------- addressbook/gui/widgets/Makefile.am | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'addressbook') diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am index c723ead970..1724edf699 100644 --- a/addressbook/contact-editor/Makefile.am +++ b/addressbook/contact-editor/Makefile.am @@ -30,13 +30,13 @@ contact_editor_test_SOURCES = \ test-editor.c contact_editor_test_LDADD = \ + $(srcdir)/libecontacteditor.a \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ $(GNOMEGNORBA_LIBS) \ - -lbonobo \ - $(top_builddir)/e-util/libeutil.la \ - libecontacteditor.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/widgets/e-table/libetable.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a \ diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index c723ead970..1724edf699 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -30,13 +30,13 @@ contact_editor_test_SOURCES = \ test-editor.c contact_editor_test_LDADD = \ + $(srcdir)/libecontacteditor.a \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ $(GNOMEGNORBA_LIBS) \ - -lbonobo \ - $(top_builddir)/e-util/libeutil.la \ - libecontacteditor.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/widgets/e-table/libetable.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a \ diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am index cc96918a77..7a42e8372a 100644 --- a/addressbook/gui/minicard/Makefile.am +++ b/addressbook/gui/minicard/Makefile.am @@ -34,8 +34,8 @@ minicard_label_test_SOURCES = \ minicard_label_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a @@ -45,8 +45,8 @@ minicard_test_SOURCES = \ minicard_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ @@ -62,8 +62,8 @@ reflow_test_SOURCES = \ reflow_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(BONOBO_GNOME_LIBS) \ + $(srcdir)/libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ @@ -79,8 +79,8 @@ minicard_view_test_SOURCES = \ minicard_view_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(BONOBO_GNOME_LIBS) \ + $(srcdir)/libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index cc96918a77..7a42e8372a 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -34,8 +34,8 @@ minicard_label_test_SOURCES = \ minicard_label_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a @@ -45,8 +45,8 @@ minicard_test_SOURCES = \ minicard_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ @@ -62,8 +62,8 @@ reflow_test_SOURCES = \ reflow_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(BONOBO_GNOME_LIBS) \ + $(srcdir)/libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ @@ -79,8 +79,8 @@ minicard_view_test_SOURCES = \ minicard_view_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ + $(BONOBO_GNOME_LIBS) \ + $(srcdir)/libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ -- cgit v1.2.3