added makefiles for calendar conduits

	* configure.in: added makefiles for calendar conduits

	* gui/Makefile.am (SUBDIRS):
	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from
	the gui directory to here.

	* Makefile.am (SUBDIRS): added conduits to SIBDIRS

svn path=/trunk/; revision=4058

10 files changed, 135 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 57a2869f5e..d4e81b52c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-10  Seth Alves  <alves@hungry.com>
+
+	* configure.in: added makefiles for calendar conduits
+
 2000-07-10  Dan Winship  <danw@helixcode.com>
 
 	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0d3bf2333b..914b0ae494 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-10  Seth Alves  <alves@hungry.com>
+
+	* gui/Makefile.am (SUBDIRS): 
+	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from
+	the gui directory to here.
+
+	* Makefile.am (SUBDIRS): added conduits to SIBDIRS
+
 2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* gui/calendar-commands.c (calendar_control_activate): Remove
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index e173063a48..de67541fa6 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 conduits
diff --git a/calendar/conduits/.cvsignore b/calendar/conduits/.cvsignore
new file mode 100644
index 0000000000..b840c21800
--- /dev/null
+++ b/calendar/conduits/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
\ No newline at end of file
diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am
new file mode 100644
index 0000000000..7f60f24bef
--- /dev/null
+++ b/calendar/conduits/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = calendar
+# todo
\ No newline at end of file
diff --git a/calendar/conduits/calendar/.cvsignore b/calendar/conduits/calendar/.cvsignore
new file mode 100644
index 0000000000..0a6c584a7a
--- /dev/null
+++ b/calendar/conduits/calendar/.cvsignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+.deps
+calendar.conduit
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
new file mode 100644
index 0000000000..7d421f619b
--- /dev/null
+++ b/calendar/conduits/calendar/Makefile.am
@@ -0,0 +1,83 @@
+#
+#
+#
+
+INCLUDES = 				\
+	-I$(top_srcdir)/calendar	\
+	$(GNOME_PILOT_CFLAGS)
+
+file_conduitsdir=$(libdir)/gnome-pilot/conduits
+
+bin_PROGRAMS = calendar-conduit-control-applet
+
+calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c
+
+calendar_conduit_control_applet_LDADD = \
+		$(CAPPLET_LIBS)  \
+		$(GNOME_LIBDIR) \
+		-lgpilotdcm \
+		-lgpilotd \
+		-lgpilotdconduit \
+		$(GNOME_CAPPLET_LIBS) \
+		$(BONOBO_VFS_GNOME_LIBS) \
+		$(GNOME_XML_LIB) \
+	        $(GNOMEUI_LIBS) \
+		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
+                $(INTLLIBS)
+
+
+#		$(top_builddir)/libgpilotdCM/libgpilotdcm.la \
+#		$(top_builddir)/gpilotd/libgpilotd.la \
+#		$(top_builddir)/gpilotd/libgpilotdconduit.la \
+
+
+if HAVE_GNOME_PILOT
+# calendar_conduit
+calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
+calendar_conduits_LTLIBRARIES = libcalendar_conduit.la
+
+libcalendar_conduit_la_SOURCES = \
+	calendar-conduit.c
+
+# calendar-conduit.c: my_gnomecal_idl
+
+calendar.conduit: calendar.conduit.in Makefile
+	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/calendar.conduit.in > calendar.conduit.tmp \
+	&& mv calendar.conduit.tmp calendar.conduit
+endif 
+
+
+libcalendar_conduit_la_LDFLAGS = \
+	-rpath $(libdir)
+
+libcalendar_conduit_la_LIBADD = 				\
+	$(BONOBO_VFS_GNOME_LIBS)				\
+	$(top_builddir)/calendar/cal-client/libcal-client.a	\
+	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 			\
+	$(GNOME_LIBDIR) 					\
+	$(GNOME_LIBS)
+
+
+#	$(top_builddir)/calendar/cal-util/libcal-util.la	\
+#	$(top_builddir)/libversit/libversit.la			\
+#	$(top_builddir)/libical/src/libical/libical.la 		\
+
+
+ccenterdir = $(datadir)/control-center
+ccenterPalmPilotdir = $(ccenterdir)/Peripherals
+ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ccenterConduits_DATA = calendar-conduit-control-applet.desktop 
+
+panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+panelConduits_DATA = $(ccenterConduits_DATA)
+
+Conduitdir = $(datadir)/gnome-pilot/conduits/
+Conduit_DATA = calendar.conduit
+
+EXTRA_DIST = \
+	$(Conduit_DATA) \
+        $(ccenterConduits_DATA)
+
+install-data-local:
+	$(mkinstalldirs) $(ccenterConduitsdir)
+	$(mkinstalldirs) $(Conduitdir)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 969fd2e3ac..586a39139d 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -2,14 +2,13 @@ SUBDIRS = dialogs
 
 help_base = $(datadir)/gnome/help/cal
 
-# if HAVE_GNOME_PILOT
-#CPS = calendar-pilot-sync #empty-pilot-calendar
-# else
-#CPS =
-# endif
+if HAVE_GNOME_PILOT
+CPS = calendar-pilot-sync
+else
+CPS =
+endif
 
-# bin_PROGRAMS = evolution-calendar $(CPS)
-bin_PROGRAMS = evolution-calendar
+bin_PROGRAMS = evolution-calendar $(CPS)
 
 CPPFLAGS =					\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
@@ -47,8 +46,6 @@ glade_DATA = 					\
 
 glade_messages = event-editor-dialog.glade.h
 
-# calendar-conduit-control-applet
-
 evolution_calendar_SOURCES =			\
 	alarm.c					\
 	alarm.h					\
@@ -107,25 +104,25 @@ evolution_calendar_LDADD =					\
 
 evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
 
-# if HAVE_GNOME_PILOT
-
-# calendar_pilot_sync_SOURCES =			\
-# 	    calendar-pilot-sync.c
-# 
-# calendar_pilot_sync_INCLUDES =		\
-# 	    $(INCLUDES)			\
-# 	    $(GNOME_PILOT_CFLAGS)		\
-# 	    $(PISOCK_INCLUDEDIR)		\
-# 	    $(GNOME_CONDUIT_INCLUDEDIR)
-# 
-# calendar_pilot_sync_LDADD = -lpisock		\
-# 	    $(BONOBO_VFS_GNOME_LIBS)		\
-# 	    $(LINK_FLAGS)				\
-# 	    $(EXTRA_GNOME_LIBS)			\
-# 	    $(BONOBO_HTML_GNOME_LIBS)		\
-# 	    $(GNOME_PILOT_LIBS)			\
-# 	    $(PISOCK_LIBS)
-# endif
+if HAVE_GNOME_PILOT
+calendar_pilot_sync_SOURCES =			\
+	    calendar-pilot-sync.c
+
+calendar_pilot_sync_INCLUDES =			\
+	    $(INCLUDES)				\
+	    $(GNOME_PILOT_CFLAGS)		\
+	    $(PISOCK_INCLUDEDIR)		\
+	    $(GNOME_CONDUIT_INCLUDEDIR)
+
+calendar_pilot_sync_LDADD = -lpisock		\
+	    $(BONOBO_VFS_GNOME_LIBS)		\
+	    $(LINK_FLAGS)			\
+	    $(EXTRA_GNOME_LIBS)			\
+	    $(BONOBO_HTML_GNOME_LIBS)		\
+	    $(GNOME_PILOT_LIBS)			\
+	    $(PISOCK_LIBS)
+endif
+
 
 if USING_OAF
 oafdir = $(datadir)/oaf
@@ -148,11 +145,13 @@ EXTRA_DIST =	 			\
 	monthview.xpm			\
 	yearview.xpm			\
 	calendar-control.gnorba		\
-	calendar-control.oafinfo
+	calendar-control.oafinfo	\
+	gnomecal.conduit
 
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
+	$(mkinstalldirs) $(Conduitsdir)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/calendar/gui/calendar-pilot-sync.c b/calendar/gui/calendar-pilot-sync.c
index d9f44c14cb..c8cd574608 100644
--- a/calendar/gui/calendar-pilot-sync.c
+++ b/calendar/gui/calendar-pilot-sync.c
@@ -747,8 +747,7 @@ gnome_calendar_load_cb (GtkWidget *cal_client,
 		printf ("<Syncing>\n");
 		sync_pilot (client, *link);
 		printf ("</Syncing>\n");
-	}
-	else {
+	} else {
 		if (tried) {
 			printf ("load and create of calendar failed\n");
 			return;
diff --git a/configure.in b/configure.in
index 2e45957c6d..760a16927b 100644
--- a/configure.in
+++ b/configure.in
@@ -519,6 +519,8 @@ calendar/cal-client/Makefile
 calendar/pcs/Makefile
 calendar/gui/Makefile
 calendar/gui/dialogs/Makefile
+calendar/conduits/Makefile
+calendar/conduits/calendar/Makefile
 filter/Makefile
 notes/Makefile
 wombat/Makefile