aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--addressbook/contact-editor/Makefile.am6
-rw-r--r--addressbook/gui/contact-editor/Makefile.am6
-rw-r--r--addressbook/gui/minicard/Makefile.am16
-rw-r--r--addressbook/gui/widgets/Makefile.am16
-rw-r--r--wombat/Makefile.am3
6 files changed, 31 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index cafe126eb8..fc302ea682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-05 Mathieu Lacage <mathieu@gnome.org>
+
+ * addressbook/contact-editor/Makefile.am: make it
+ compile: add proper bonobo linking params.
+ * addressbook/gui/minicard/Makefile.am: idem.
+ * wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.
+ cleanup some useless includes and libs.
+
2000-06-02 Ettore Perazzoli <ettore@helixcode.com>
* configure.in (ALL_LINGUAS): Add `it' and `de'.
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 \
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index f5715e7aea..d9494c978b 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -6,8 +6,8 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/calendar/pcs \
- $(EXTRA_GNOME_CFLAGS) \
$(GNOME_INCLUDEDIR) \
+ $(BONOBO_VFS_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
@@ -28,7 +28,6 @@ wombat_LDADD = \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la \
- -lgnomevfs \
$(LDAP_LIBS)
wombat_LDFLAGS = `gnome-config --libs gnorba`