+ * wombat/wombat.gnorba: new file.

+
+	* wombat/.cvsignore: new file.
+
+	* wombat/wombat.c (setup_pcs): fill out this function some.
+
+	* configure.in: added wombat.
+
+	* pcs/Makefile.am: create a libpcs.la library, for use in the
+	wombat.

svn path=/trunk/; revision=2241

8 files changed, 72 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c702f41d31..fc6d71e2d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-03-28  Matt Loper  <matt@helixcode.com>
+
+	* wombat/wombat.gnorba: new file.
+
+	* wombat/.cvsignore: new file.
+
+	* wombat/wombat.c (setup_pcs): fill out this function some.
+
+	* configure.in: added wombat.
+
 2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
 
 	* addressbook/backend/pas/pas-backend-file.c
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 951063b456..9a51ce0df5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-28  Matt Loper  <matt@helixcode.com>
+
+	* pcs/Makefile.am: create a libpcs.la library, for use in the
+	wombat.
+
 2000-03-28  Seth Alves  <alves@hungry.com>
 
 	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a
diff --git a/calendar/pcs/.cvsignore b/calendar/pcs/.cvsignore
index 46467e3f77..d176ba6089 100644
--- a/calendar/pcs/.cvsignore
+++ b/calendar/pcs/.cvsignore
@@ -7,3 +7,4 @@ evolution-calendar-common.c
 evolution-calendar.h
 tlacuache
 .libs
+*.la
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index 269ba2f5c6..a567597975 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -3,6 +3,7 @@
 #
 
 bin_PROGRAMS = tlacuache
+lib_LTLIBRARIES = libpcs.la
 
 #INCLUDES = \
 #        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -65,6 +66,23 @@ tlacuache_SOURCES =		\
 #	cal-util.c		\
 #	cal-util.h		\
 
+libpcs_la_SOURCES =             \
+	$(CORBA_GENERATED)	\
+	cal.c			\
+	cal-backend.c		\
+	cal-factory.c		\
+	icalendar.c		\
+	job.c			
+
+libpcsincludedir = $(includedir)/calendar/pcs
+
+libpcsinclude_HEADERS =					\
+	cal.h			\
+	cal-backend.h		\
+	cal-common.h		\
+	cal-factory.h		\
+	icalendar.h		\
+	job.h			
 
 ICAL_LINK_FLAGS = $(top_builddir)/libical/src/libical/libical.la
 
diff --git a/configure.in b/configure.in
index 86743ccaa3..8cd6c96fab 100644
--- a/configure.in
+++ b/configure.in
@@ -295,4 +295,5 @@ calendar/cal-client/Makefile
 calendar/pcs/Makefile
 calendar/gui/Makefile
 filter/Makefile
+wombat/Makefile
 ])
diff --git a/wombat/.cvsignore b/wombat/.cvsignore
new file mode 100644
index 0000000000..e321f442a5
--- /dev/null
+++ b/wombat/.cvsignore
@@ -0,0 +1,11 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+*.la
+wombat-stubs.c
+wombat-skels.c
+wombat-common.c
+wombat.h
+wombat
diff --git a/wombat/wombat.c b/wombat/wombat.c
index e2fc716d51..034b97f478 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -7,8 +7,8 @@
 
 #include <config.h>
 #include <bonobo.h>
-#include <addressbook/backend/pas/pas-book-factory.h>
-#include <addressbook/backend/pas/pas-backend-file.h>
+#include <backend/pas-book-factory.h>
+#include <backend/pas-backend-file.h>
 
 CORBA_Environment ev;
 CORBA_ORB orb;
@@ -26,9 +26,20 @@ setup_pas (int argc, char **argv)
 	pas_book_factory_activate (factory);
 }
 
+#include "cal-factory.h"
+#include "calobj.h"
 static void
 setup_pcs (int argc, char **argv)
 {
+	CalFactory *factory;
+
+	factory = cal_factory_new ();
+	if (!factory) {
+		g_message ("%s: %d: couldn't create a Calendar factory\n",
+			   __FILE__, __LINE__);
+	}
+	
+		
 }
 
 static void
@@ -36,6 +47,7 @@ setup_config (int argc, char **argv)
 {
 }
 
+#include <libgnomevfs/gnome-vfs-init.h>
 static void
 setup_vfs (int argc, char **argv)
 {
@@ -45,6 +57,7 @@ setup_vfs (int argc, char **argv)
 	}
 }
 
+#include <libgnorba/gnorba.h>
 static void
 init_bonobo (int argc, char **argv)
 {
diff --git a/wombat/wombat.gnorba b/wombat/wombat.gnorba
new file mode 100644
index 0000000000..0e5839cc55
--- /dev/null
+++ b/wombat/wombat.gnorba
@@ -0,0 +1,11 @@
+[evolution:card-server]
+type=exe
+repo_id=IDL:Evolution/CardServer:1.0
+description=The Personal Addressbook Server
+location_info=wombat
+
+[evolution:calendar-factory]
+type=exe
+repo_id=IDL:Evolution/Calendar/CalFactory:1.0 IDL:Bonobo/Unknown:1.0
+description=Calendar factory for the Personal Calendar Server
+location_info=wombat