new file -- things shared between the client and server go in this

        * cal-util/Makefile.am: new file -- things shared between
        the client and server go in this directory

        *  calobj.c calobj.h icalendar.c icalendar.h
        timeutil.c timeutil.h cal-util.c cal-util.h where moved
        backend stuff went into pcs.  shared stuff went into
        cal-util.

svn path=/trunk/; revision=2032

17 files changed, 31 insertions, 28 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index d9001476a4..40e1357a62 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = doc idl pcs cal-client
+SUBDIRS = doc idl cal-util pcs cal-client
 
 idldir = $(datadir)/idl
 idl_DATA = 			\
@@ -27,7 +27,8 @@ INCLUDES = 						\
 	$(BONOBO_VFS_GNOME_CFLAGS)			\
 	$(GNOME_CONDUIT_INCLUDEDIR)			\
 	$(PISOCK_INCLUDEDIR)                  		\
-	-I../libical/src/libical			\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/libical/src/libical		\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
 GNOMECAL_CORBA_GENERATED =	\
@@ -51,11 +52,7 @@ gnomecal_SOURCES =				\
 	GnomeCal.h				\
 	alarm.c					\
 	alarm.h					\
-	calendar.c				\
-	calendar.h				\
 	calendar-conduit.h			\
-	calobj.c				\
-	calobj.h				\
 	eventedit.c				\
 	eventedit.h				\
 	corba-cal.c				\
@@ -78,8 +75,6 @@ gnomecal_SOURCES =				\
 	gnome-cal.c				\
 	gnome-cal.h				\
 	goto.c					\
-	icalendar.c				\
-	icalendar.h				\
 	layout.c				\
 	layout.h				\
 	main.c					\
@@ -93,14 +88,21 @@ gnomecal_SOURCES =				\
 	prop.c					\
 	quick-view.c				\
 	quick-view.h				\
-	timeutil.c				\
-	timeutil.h				\
 	todo-conduit.h				\
 	view-utils.h				\
 	view-utils.c				\
 	year-view.c				\
 	year-view.h
 
+#	calendar.c				\
+#	calendar.h				\
+#	calobj.c				\
+#	calobj.h				\
+#	icalendar.c				\
+#	icalendar.h				\
+#	timeutil.c				\
+#	timeutil.h				\
+
 calendar_pilot_sync_SOURCES =	\
 	GnomeCal-common.c	\
 	GnomeCal-stubs.c	\
@@ -116,6 +118,7 @@ calendar_pilot_sync_SOURCES =	\
 LINK_FLAGS = \
 	$(BONOBO_VFS_GNOME_LIBS) \
 	$(INTLLIBS) \
+	cal-util/libcalutil.la \
 	../libversit/libversit.la \
 	$(ICAL_LINK_FLAGS)
 
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index 2dc77e623b..6bb5c1afa5 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -2,7 +2,7 @@
 #define ALARM_H
 
 #include <time.h>
-#include "calobj.h"
+#include "pcs/calobj.h"
 
 typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse);
 
diff --git a/calendar/gui/alarm.h b/calendar/gui/alarm.h
index 2dc77e623b..6bb5c1afa5 100644
--- a/calendar/gui/alarm.h
+++ b/calendar/gui/alarm.h
@@ -2,7 +2,7 @@
 #define ALARM_H
 
 #include <time.h>
-#include "calobj.h"
+#include "pcs/calobj.h"
 
 typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse);
 
diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c
index 172ef3390e..776f38452d 100644
--- a/calendar/gui/calendar.c
+++ b/calendar/gui/calendar.c
@@ -20,7 +20,7 @@
 #include "calendar.h"
 #include "alarm.h"
 #include "timeutil.h"
-#include "../libversit/vcc.h"
+#include "libversit/vcc.h"
 #include "icalendar.h"
 
 #ifdef HAVE_TZNAME
diff --git a/calendar/gui/calendar.h b/calendar/gui/calendar.h
index 23fa65c094..83a5f67c84 100644
--- a/calendar/gui/calendar.h
+++ b/calendar/gui/calendar.h
@@ -1,7 +1,7 @@
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
-#include "calobj.h"
+#include "pcs/calobj.h"
 
 BEGIN_GNOME_DECLS
 
diff --git a/calendar/gui/corba-cal-factory.c b/calendar/gui/corba-cal-factory.c
index a86af3c238..a0630fda73 100644
--- a/calendar/gui/corba-cal-factory.c
+++ b/calendar/gui/corba-cal-factory.c
@@ -12,8 +12,8 @@
 #include "gnome-cal.h"
 #include "main.h"
 #include "alarm.h"
-#include "timeutil.h"
-#include "../libversit/vcc.h"
+#include "cal-util/timeutil.h"
+#include "libversit/vcc.h"
 #include <libgnorba/gnorba.h>
 #include <bonobo.h>
 #include "GnomeCal.h"
diff --git a/calendar/gui/corba-cal.c b/calendar/gui/corba-cal.c
index 6d848ddb87..759b989893 100644
--- a/calendar/gui/corba-cal.c
+++ b/calendar/gui/corba-cal.c
@@ -12,8 +12,8 @@
 #include "calendar.h"
 #include "gnome-cal.h"
 #include "alarm.h"
-#include "timeutil.h"
-#include "../libversit/vcc.h"
+#include "cal-util/timeutil.h"
+#include "libversit/vcc.h"
 #include <libgnorba/gnome-factory.h>
 #include "GnomeCal.h"
 #include "corba-cal-factory.h"
diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c
index a3ec95da07..e65db4e3da 100644
--- a/calendar/gui/eventedit.c
+++ b/calendar/gui/eventedit.c
@@ -11,7 +11,7 @@
 #include "calendar.h"
 #include "eventedit.h"
 #include "main.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 
 
 static void event_editor_class_init (EventEditorClass *class);
diff --git a/calendar/gui/gncal-day-panel.c b/calendar/gui/gncal-day-panel.c
index f407a497d3..8d21b6fabc 100644
--- a/calendar/gui/gncal-day-panel.c
+++ b/calendar/gui/gncal-day-panel.c
@@ -10,7 +10,7 @@
 #include <gtk/gtkhseparator.h>
 #include "gncal-day-panel.h"
 #include "main.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 
 
 guint
diff --git a/calendar/gui/gncal-day-view.c b/calendar/gui/gncal-day-view.c
index 22a0859069..955aac0ef9 100644
--- a/calendar/gui/gncal-day-view.c
+++ b/calendar/gui/gncal-day-view.c
@@ -8,7 +8,7 @@
 
 #include <gnome.h>
 #include "gncal-day-view.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 #include "view-utils.h"
 #include "main.h"
 #include "eventedit.h"
diff --git a/calendar/gui/gncal-week-view.c b/calendar/gui/gncal-week-view.c
index 888c656ff4..553977e076 100644
--- a/calendar/gui/gncal-week-view.c
+++ b/calendar/gui/gncal-week-view.c
@@ -12,7 +12,7 @@
 #include <gtk/gtk.h>
 #include "gncal-week-view.h"
 #include "main.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 
 static void gncal_week_view_init (GncalWeekView *wview);
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 0e3c475fdf..8682099900 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -17,7 +17,7 @@
 #include "gncal-week-view.h"
 #include "month-view.h"
 #include "year-view.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 #include "main.h"
 #include "corba-cal.h"
 
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index 41609da678..ef756a5463 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -11,7 +11,7 @@
 #include "gnome-month-item.h"
 #include "main.h"
 #include "mark.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 
 
 static GtkWidget *goto_win;		/* The goto dialog window */
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index eb1823fc6f..c4db8701ad 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -21,7 +21,7 @@
 #include "eventedit.h"
 #include "gnome-cal.h"
 #include "main.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 #include "corba-cal-factory.h"
 
 #define COOKIE_USER_HOME_DIR ((char *) -1)
diff --git a/calendar/gui/mark.c b/calendar/gui/mark.c
index 2de8e2b880..288b6d3b11 100644
--- a/calendar/gui/mark.c
+++ b/calendar/gui/mark.c
@@ -9,7 +9,7 @@
 #include "gnome-cal.h"
 #include "main.h"
 #include "mark.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 
 
 /* Frees the specified data when an object is destroyed */
diff --git a/calendar/gui/month-view.c b/calendar/gui/month-view.c
index 5df7b7a23d..0a7386f9e4 100644
--- a/calendar/gui/month-view.c
+++ b/calendar/gui/month-view.c
@@ -14,7 +14,7 @@
 #include "main.h"
 #include "mark.h"
 #include "quick-view.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 
 
 /* Spacing between title and calendar */
diff --git a/calendar/gui/year-view.c b/calendar/gui/year-view.c
index 5744b4a88f..567340bde1 100644
--- a/calendar/gui/year-view.c
+++ b/calendar/gui/year-view.c
@@ -14,7 +14,7 @@
 #include "main.h"
 #include "mark.h"
 #include "quick-view.h"
-#include "timeutil.h"
+#include "cal-util/timeutil.h"
 
 
 #define HEAD_SPACING 4		/* Spacing between year heading and months */