aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/conduit/Makefile.am8
2 files changed, 8 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 0de85ed033..85c34066df 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-27 JP Rosevear <jpr@ximian.com>
+
+ * conduit/Makefile.am: Tidy ldadds
+
2001-07-26 Jon Trowbridge <trow@ximian.com>
* gui/component/select-names/e-select-names-bonobo.c: Fixing a
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index d95d858fd8..4c564a069d 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -4,9 +4,9 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/backend \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
- $(BONOBO_GNOME_CFLAGS) \
$(PISOCK_CFLAGS) \
- $(GNOME_PILOT_CFLAGS)
+ $(GNOME_PILOT_CFLAGS) \
+ $(BONOBO_GNOME_CFLAGS)
# Address Conduit
e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
@@ -24,10 +24,10 @@ libeaddress_conduit_la_LIBADD = \
$(top_builddir)/e-util/ename/libename-static.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeconduit-static.la \
- $(GNOME_PILOT_LIBS) \
$(PISOCK_LIBS) \
+ $(GNOME_PILOT_LIBS) \
+ $(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
$(GNOME_LIBDIR) \
$(GNOME_LIBS)