aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.am4
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/Makefile.am2
4 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 820f90563e..6aa55a93c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2000-03-29 Matt Loper <matt@helixcode.com>
+ * Makefile.am: add calendar compilation back in.
+
* addressbook/backend/pas/pas-book-factory.c
(PAS_BOOK_FACTORY_GOAD_ID): changed to
"evolution:addressbook-server".
diff --git a/Makefile.am b/Makefile.am
index 189c698d88..990957f09c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,12 +25,10 @@ SUBDIRS = \
libical \
libversit \
addressbook \
+ calendar \
wombat \
po
-# Add this when the calendar builds.
-# calendar
-
dist-hook:
for subdir in intl ; do \
mkdir $(distdir)/$$subdir ; \
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 9a51ce0df5..a960ec7d99 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-29 Matt Loper <matt@helixcode.com>
+
+ * Makefile.am: remove the gui directory, which doesn't compile.
+
2000-03-28 Matt Loper <matt@helixcode.com>
* pcs/Makefile.am: create a libpcs.la library, for use in the
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index e173063a48..c84efe5eeb 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1 +1 @@
-SUBDIRS = doc idl cal-util pcs cal-client gui
+SUBDIRS = doc idl cal-util pcs cal-client # gui