aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/Makefile.am7
-rw-r--r--addressbook/conduit/Makefile.am3
3 files changed, 16 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 772fcd052e..515ab337b2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
2000-08-13 Chris Toshok <toshok@helixcode.com>
+ * conduit/Makefile.am (libaddress_conduit_la_SOURCES): add
+ address-conduit.h
+
+ * Makefile.am (CONDUIT_SUBDIR): only set subdir if
+ ENABLE_PILOT_CONDUITS is set.
+
+2000-08-13 Chris Toshok <toshok@helixcode.com>
+
* Makefile.am (SUBDIRS): add conduit subdir.
2000-08-13 Chris Toshok <toshok@helixcode.com>
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 92b5fe5607..66581af8ed 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,2 +1,7 @@
+if ENABLE_PILOT_CONDUITS
+CONDUIT_SUBDIR=conduit
+endif
+
SUBDIRS = \
- ename backend printing contact-editor gui conduit
+ ename backend printing contact-editor gui $(CONDUIT_SUBDIR)
+
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 056045001f..c45e24714d 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -26,7 +26,8 @@ address_conduitsdir=$(libdir)/gnome-pilot/conduits
address_conduits_LTLIBRARIES = libaddress_conduit.la
libaddress_conduit_la_SOURCES = \
- address-conduit.c
+ address-conduit.c \
+ address-conduit.h
# address-conduit.c: my_gnomecal_idl