aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/Makefile.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 7fac5d5ee2..772fcd052e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,9 @@
2000-08-13 Chris Toshok <toshok@helixcode.com>
+ * Makefile.am (SUBDIRS): add conduit subdir.
+
+2000-08-13 Chris Toshok <toshok@helixcode.com>
+
* conduit/address-conduit.c (conduit_get_gpilot_conduit): add
special oaf initialization hack so conduit can find wombat, and
accept all cookies so that we can actually talk to oaf.
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 0b429e62f3..92b5fe5607 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,2 +1,2 @@
SUBDIRS = \
- ename backend printing contact-editor gui
+ ename backend printing contact-editor gui conduit