diff options
-rw-r--r-- | calendar/ChangeLog | 4 | ||||
-rw-r--r-- | calendar/Makefile.am | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 898a9eca5b..d6327408cc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,7 @@ +2003-01-14 Ettore Perazzoli <ettore@ximian.com> + + * Makefile.am: Comment out the CONDUIT_DIR stuff for now. + 2003-01-14 Rodney Dawes <dobey@ximian.com> * gui/gnome-cal.c: Use GtkPaned instead of EPaned diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 0e4c8d28eb..1d7e5941db 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -1,9 +1,10 @@ -if ENABLE_PILOT_CONDUITS -CONDUIT_DIR = conduits -else -CONDUIT_DIR = -endif +# if ENABLE_PILOT_CONDUITS +# CONDUIT_DIR = conduits +# else +# CONDUIT_DIR = +# endif -SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR) +# SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR) +SUBDIRS = idl cal-util pcs cal-client gui EXTRA_DIST = zones.h |