aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/Makefile.am
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-01-27 14:06:21 +0800
committerChris Toshok <toshok@src.gnome.org>2003-01-27 14:06:21 +0800
commit35313309b875cc3316619583530134cd7d029731 (patch)
treee205753b25a2d4c9f6b0958c7bcaeb39f2863d40 /calendar/Makefile.am
parentc509e2e85b3b4e264da53c24d1a0c91b889961e1 (diff)
downloadgsoc2013-evolution-35313309b875cc3316619583530134cd7d029731.tar.gz
gsoc2013-evolution-35313309b875cc3316619583530134cd7d029731.tar.zst
gsoc2013-evolution-35313309b875cc3316619583530134cd7d029731.zip
fix warning. (get_default_timezone): BonoboConfigDatabase ->
2003-01-26 Chris Toshok <toshok@ximian.com> * conduits/calendar/calendar-conduit.c (start_calendar_server): fix warning. (get_default_timezone): BonoboConfigDatabase -> e_config_listener. (accept_all_cookies): remove. (conduit_get_gpilot_conduit): remove the oaf initialization stuff. * conduits/todo/todo-conduit.c (start_calendar_server): fix warning. (get_default_timezone): BonoboConfigDatabase -> e_config_listener. (accept_all_cookies): remove. (conduit_get_gpilot_conduit): remove the oaf initialization stuff. * Makefile.am (CONDUIT_DIR): uncomment the conduit stuff. svn path=/trunk/; revision=19642
Diffstat (limited to 'calendar/Makefile.am')
-rw-r--r--calendar/Makefile.am13
1 files changed, 6 insertions, 7 deletions
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 1d7e5941db..0e4c8d28eb 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,10 +1,9 @@
-# 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
+SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR)
EXTRA_DIST = zones.h