evolution-data-server r8703 - in trunk: . addressbook addressbook/backends/file addressbook/backends/groupwise addressbook/backends/ldap addressbook/backends/vcf addressbook/libedata-book calendar calendar/libedata-cal docs/reference docs/reference/calendar/libedata-cal docs/reference/libebackend docs/reference/libedataserver libebackend libedataserver src

From: rbradford svn gnome org
To: svn-commits-list gnome org
Subject: evolution-data-server r8703 - in trunk: . addressbook addressbook/backends/file addressbook/backends/groupwise addressbook/backends/ldap addressbook/backends/vcf addressbook/libedata-book calendar calendar/libedata-cal docs/reference docs/reference/calendar/libedata-cal docs/reference/libebackend docs/reference/libedataserver libebackend libedataserver src
Date: Tue, 29 Apr 2008 15:34:36 +0100 (BST)
Author: rbradford
Date: Tue Apr 29 14:34:35 2008
New Revision: 8703
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8703&view=rev

Log:
2009-04-23  Rob Bradford  <rob openedhand com>

	* Makefile.am:
	* configure.in:
	* libebackend/Makefile.am:
	* libebackend/libebackend.pc.in:
	Build framework for new libebackend library.

	* libedataserver/Makefile.am:
	Remove files that have moved to libebackend.

	* libedataserver/e-data-server-module.[ch]:
	* libedataserver/e-db3-utils.[ch]:
	* libedataserver/e-dbhash.[ch]:
	* libedataserer/e-file-cache.[ch]:
	Moved to libebackend.

	* src/Makefile.am:
	* src/server.c:
	Use libebackend headers and link to the library.

	* docs/reference/Makefile.am:
	* docs/reference/libebackend/Makefile.am:
	* docs/reference/libebackend/libebackend-docs.xml:
	* docs/reference/libebackend/libebackend-sections.txt:
	* docs/reference/libebackend/libebackend.types:
	Add documentation for new libebackend library.

	* docs/reference/libedataserver/libedataserver.types:
	Remove types that have been moved to libebackend.

	* docs/reference/calendar/libedata-cal/Makefile.am:
	Add libebackend to the gtk-doc scanner libraries.



Added:
   trunk/docs/reference/libebackend/
   trunk/docs/reference/libebackend/Makefile.am
   trunk/docs/reference/libebackend/libebackend-docs.xml
   trunk/docs/reference/libebackend/libebackend-sections.txt
   trunk/docs/reference/libebackend/libebackend.types
   trunk/libebackend/
   trunk/libebackend/Makefile.am
   trunk/libebackend/e-data-server-module.c
      - copied, changed from r8670, /trunk/libedataserver/e-data-server-module.c
   trunk/libebackend/e-data-server-module.h
      - copied unchanged from r8670, /trunk/libedataserver/e-data-server-module.h
   trunk/libebackend/e-db3-utils.c
      - copied unchanged from r8670, /trunk/libedataserver/e-db3-utils.c
   trunk/libebackend/e-db3-utils.h
      - copied unchanged from r8670, /trunk/libedataserver/e-db3-utils.h
   trunk/libebackend/e-dbhash.c
      - copied unchanged from r8670, /trunk/libedataserver/e-dbhash.c
   trunk/libebackend/e-dbhash.h
      - copied unchanged from r8670, /trunk/libedataserver/e-dbhash.h
   trunk/libebackend/e-file-cache.c
      - copied, changed from r8670, /trunk/libedataserver/e-file-cache.c
   trunk/libebackend/e-file-cache.h
      - copied unchanged from r8670, /trunk/libedataserver/e-file-cache.h
   trunk/libebackend/libebackend.pc.in
Removed:
   trunk/libedataserver/e-data-server-module.c
   trunk/libedataserver/e-data-server-module.h
   trunk/libedataserver/e-db3-utils.c
   trunk/libedataserver/e-db3-utils.h
   trunk/libedataserver/e-dbhash.c
   trunk/libedataserver/e-dbhash.h
   trunk/libedataserver/e-file-cache.c
   trunk/libedataserver/e-file-cache.h
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/addressbook/ChangeLog
   trunk/addressbook/backends/file/Makefile.am
   trunk/addressbook/backends/file/e-book-backend-file-factory.c
   trunk/addressbook/backends/file/e-book-backend-file.c
   trunk/addressbook/backends/groupwise/Makefile.am
   trunk/addressbook/backends/groupwise/e-book-backend-groupwise-factory.c
   trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c
   trunk/addressbook/backends/ldap/e-book-backend-ldap-factory.c
   trunk/addressbook/backends/vcf/Makefile.am
   trunk/addressbook/backends/vcf/e-book-backend-vcf-factory.c
   trunk/addressbook/libedata-book/Makefile.am
   trunk/addressbook/libedata-book/e-book-backend-cache.h
   trunk/addressbook/libedata-book/e-data-book-factory.c
   trunk/calendar/ChangeLog
   trunk/calendar/libedata-cal/e-cal-backend-cache.h
   trunk/calendar/libedata-cal/e-data-cal-factory.c
   trunk/configure.in
   trunk/docs/reference/Makefile.am
   trunk/docs/reference/calendar/libedata-cal/Makefile.am
   trunk/docs/reference/libedataserver/libedataserver.types
   trunk/libedataserver/Makefile.am
   trunk/src/Makefile.am
   trunk/src/server.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -9,8 +9,7 @@
 CALENDAR_DIR = calendar
 endif
 
-SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
+SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
 
 changelogs =			\
 	ChangeLog

Modified: trunk/addressbook/backends/file/Makefile.am
==============================================================================
--- trunk/addressbook/backends/file/Makefile.am	(original)
+++ trunk/addressbook/backends/file/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -18,6 +18,7 @@
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+	$(top_builddir)/libebackend/libebackend-1.2.la		\
 	$(DB_LIBS)				\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 

Modified: trunk/addressbook/backends/file/e-book-backend-file-factory.c
==============================================================================
--- trunk/addressbook/backends/file/e-book-backend-file-factory.c	(original)
+++ trunk/addressbook/backends/file/e-book-backend-file-factory.c	Tue Apr 29 14:34:35 2008
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "libedataserver/e-data-server-module.h"
+#include "libebackend/e-data-server-module.h"
 #include "libedata-book/e-book-backend-factory.h"
 #include "e-book-backend-file.h"
 

Modified: trunk/addressbook/backends/file/e-book-backend-file.c
==============================================================================
--- trunk/addressbook/backends/file/e-book-backend-file.c	(original)
+++ trunk/addressbook/backends/file/e-book-backend-file.c	Tue Apr 29 14:34:35 2008
@@ -40,8 +40,9 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
-#include "libedataserver/e-dbhash.h"
-#include "libedataserver/e-db3-utils.h"
+#include "libebackend/e-dbhash.h"
+#include "libebackend/e-db3-utils.h"
+
 #include "libedataserver/e-data-server-util.h"
 #include "libedataserver/e-flag.h"
 

Modified: trunk/addressbook/backends/groupwise/Makefile.am
==============================================================================
--- trunk/addressbook/backends/groupwise/Makefile.am	(original)
+++ trunk/addressbook/backends/groupwise/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -20,6 +20,7 @@
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+	$(top_builddir)/libebackend/libebackend-1.2.la		\
 	$(DB_LIBS)							\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
 	$(SOUP_LIBS)

Modified: trunk/addressbook/backends/groupwise/e-book-backend-groupwise-factory.c
==============================================================================
--- trunk/addressbook/backends/groupwise/e-book-backend-groupwise-factory.c	(original)
+++ trunk/addressbook/backends/groupwise/e-book-backend-groupwise-factory.c	Tue Apr 29 14:34:35 2008
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include "libedataserver/e-data-server-module.h"
+#include "libebackend/e-data-server-module.h"
 #include "libedata-book/e-book-backend-factory.h"
 #include "e-book-backend-groupwise.h"
 

Modified: trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c
==============================================================================
--- trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c	(original)
+++ trunk/addressbook/backends/groupwise/e-book-backend-groupwise.c	Tue Apr 29 14:34:35 2008
@@ -37,9 +37,10 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
+#include "libebackend/e-db3-utils.h"
+
 #include "libedataserver/e-sexp.h"
 #include "libedataserver/e-data-server-util.h"
-#include "libedataserver/e-db3-utils.h"
 #include "libedataserver/e-flag.h"
 #include "libedataserver/e-url.h"
 #include "libebook/e-contact.h"

Modified: trunk/addressbook/backends/ldap/e-book-backend-ldap-factory.c
==============================================================================
--- trunk/addressbook/backends/ldap/e-book-backend-ldap-factory.c	(original)
+++ trunk/addressbook/backends/ldap/e-book-backend-ldap-factory.c	Tue Apr 29 14:34:35 2008
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include "libedataserver/e-data-server-module.h"
+#include "libebackend/e-data-server-module.h"
 #include "libedata-book/e-book-backend-factory.h"
 #include "e-book-backend-ldap.h"
 

Modified: trunk/addressbook/backends/vcf/Makefile.am
==============================================================================
--- trunk/addressbook/backends/vcf/Makefile.am	(original)
+++ trunk/addressbook/backends/vcf/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -17,6 +17,7 @@
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+	$(top_builddir)/libebackend/libebackend-1.2.la		\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 libebookbackendvcf_la_LDFLAGS =		\

Modified: trunk/addressbook/backends/vcf/e-book-backend-vcf-factory.c
==============================================================================
--- trunk/addressbook/backends/vcf/e-book-backend-vcf-factory.c	(original)
+++ trunk/addressbook/backends/vcf/e-book-backend-vcf-factory.c	Tue Apr 29 14:34:35 2008
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include "libedataserver/e-data-server-module.h"
+#include "libebackend/e-data-server-module.h"
 #include "libedata-book/e-book-backend-factory.h"
 #include "e-book-backend-vcf.h"
 

Modified: trunk/addressbook/libedata-book/Makefile.am
==============================================================================
--- trunk/addressbook/libedata-book/Makefile.am	(original)
+++ trunk/addressbook/libedata-book/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -47,6 +47,7 @@
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+	$(top_builddir)/libebackend/libebackend-1.2.la	\
 	$(DB_LIBS)
 
 libedata_book_1_2_la_LDFLAGS = \

Modified: trunk/addressbook/libedata-book/e-book-backend-cache.h
==============================================================================
--- trunk/addressbook/libedata-book/e-book-backend-cache.h	(original)
+++ trunk/addressbook/libedata-book/e-book-backend-cache.h	Tue Apr 29 14:34:35 2008
@@ -23,7 +23,7 @@
 #ifndef E_BOOK_BACKEND_CACHE_H
 #define E_BOOK_BACKEND_CACHE_H
 
-#include "libedataserver/e-file-cache.h"
+#include "libebackend/e-file-cache.h"
 #include <libebook/e-contact.h>
 
 G_BEGIN_DECLS

Modified: trunk/addressbook/libedata-book/e-data-book-factory.c
==============================================================================
--- trunk/addressbook/libedata-book/e-data-book-factory.c	(original)
+++ trunk/addressbook/libedata-book/e-data-book-factory.c	Tue Apr 29 14:34:35 2008
@@ -16,7 +16,7 @@
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-arg.h>
-#include "libedataserver/e-data-server-module.h"
+#include "libebackend/e-data-server-module.h"
 #include "e-data-book-factory.h"
 
 #include <backends/groupwise/e-book-backend-groupwise.h>

Modified: trunk/calendar/libedata-cal/e-cal-backend-cache.h
==============================================================================
--- trunk/calendar/libedata-cal/e-cal-backend-cache.h	(original)
+++ trunk/calendar/libedata-cal/e-cal-backend-cache.h	Tue Apr 29 14:34:35 2008
@@ -22,7 +22,7 @@
 #ifndef E_CAL_BACKEND_CACHE_H
 #define E_CAL_BACKEND_CACHE_H
 
-#include "libedataserver/e-file-cache.h"
+#include "libebackend/e-file-cache.h"
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal.h>
 

Modified: trunk/calendar/libedata-cal/e-data-cal-factory.c
==============================================================================
--- trunk/calendar/libedata-cal/e-data-cal-factory.c	(original)
+++ trunk/calendar/libedata-cal/e-data-cal-factory.c	Tue Apr 29 14:34:35 2008
@@ -25,7 +25,7 @@
 #include <bonobo/bonobo-main.h>
 #include "libedataserver/e-url.h"
 #include "libedataserver/e-source.h"
-#include "libedataserver/e-data-server-module.h"
+#include "libebackend/e-data-server-module.h"
 #include "e-cal-backend.h"
 #include "e-data-cal.h"
 #include "e-data-cal-factory.h"

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Apr 29 14:34:35 2008
@@ -38,9 +38,9 @@
 AC_DEFINE_UNQUOTED(API_VERSION, "$API_VERSION", [Api version (Major.Minor)])
 
 # Libtool versioning
-LIBEDATASERVER_CURRENT=10
+LIBEDATASERVER_CURRENT=11
 LIBEDATASERVER_REVISION=0
-LIBEDATASERVER_AGE=1
+LIBEDATASERVER_AGE=0
 
 LIBEDATASERVERUI_CURRENT=9
 LIBEDATASERVERUI_REVISION=0
@@ -82,6 +82,10 @@
 LIBGDATA_GOOGLE_REVISION=0
 LIBGDATA_GOOGLE_AGE=0
 
+LIBEBACKEND_CURRENT=0
+LIBEBACKEND_REVISION=0
+LIBEBACKEND_AGE=0
+
 AC_SUBST(LIBEDATASERVER_CURRENT)
 AC_SUBST(LIBEDATASERVER_REVISION)
 AC_SUBST(LIBEDATASERVER_AGE)
@@ -115,6 +119,9 @@
 AC_SUBST(LIBGDATA_GOOGLE_CURRENT)
 AC_SUBST(LIBGDATA_GOOGLE_REVISION)
 AC_SUBST(LIBGDATA_GOOGLE_AGE)
+AC_SUBST(LIBEBACKEND_CURRENT)
+AC_SUBST(LIBEBACKEND_REVISION)
+AC_SUBST(LIBEBACKEND_AGE)
 
 dnl Put the ACLOCAL flags in the Makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -1397,7 +1404,7 @@
 dnl Flags for the various libraries we build
 dnl ****************************************
 
-dnl --- libedataserver and libedataserverui flags
+dnl --- libedataserver, libedataserverui, libebackend flags
 
 E_DATA_SERVER_DEPS="libxml-2.0 libbonobo-2.0 gconf-2.0 $mozilla_nspr"
 
@@ -1411,6 +1418,12 @@
 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
 AC_SUBST(E_DATA_SERVER_UI_LIBS)
 
+E_BACKEND_DEPS="gobject-2.0 libxml-2.0"
+
+EVO_SET_COMPILE_FLAGS(E_BACKEND, $E_BACKEND_DEPS)
+AC_SUBST(E_BACKEND_CFLAGS)
+AC_SUBST(E_BACKEND_LIBS)
+
 dnl --- evolution-addressbook flags
 
 EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 libgnome-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
@@ -1657,6 +1670,8 @@
 camel/camel.pc
 camel/camel-provider.pc
 libdb/Makefile
+libebackend/Makefile
+libebackend/libebackend.pc
 libedataserver/Makefile
 libedataserver/libedataserver.pc
 libedataserverui/Makefile
@@ -1687,6 +1702,7 @@
 docs/reference/camel/Makefile
 docs/reference/libedataserver/Makefile
 docs/reference/libedataserverui/Makefile
+docs/reference/libebackend/Makefile
 po/Makefile.in
 ])
 

Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am	(original)
+++ trunk/docs/reference/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -1,3 +1,3 @@
-SUBDIRS = addressbook calendar camel libedataserver libedataserverui
+SUBDIRS = addressbook calendar camel libedataserver libedataserverui libebackend
 MKDB_OPTIONS=--output-format=xml
 

Modified: trunk/docs/reference/calendar/libedata-cal/Makefile.am
==============================================================================
--- trunk/docs/reference/calendar/libedata-cal/Makefile.am	(original)
+++ trunk/docs/reference/calendar/libedata-cal/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -31,6 +31,7 @@
 
 GTKDOC_LIBS = \
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
+	$(top_builddir)/libebackend/libebackend-1.2.la			\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 ####################################

Added: trunk/docs/reference/libebackend/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/docs/reference/libebackend/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -0,0 +1,174 @@
+## Process this file with automake to produce Makefile.in
+# The name of the module.
+DOC_MODULE = libebackend
+
+content_files=
+HTML_IMAGES=
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE = libebackend-docs.xml
+
+#SCANGOBJ_OPTIONS =
+SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
+
+DOC_SOURCE_DIR = $(top_srcdir)/libebackend
+HFILE_GLOB = $(top_srcdir)/libebackend/*.h
+CFILE_GLOB = $(top_srcdir)/libebackend/*.c
+IGNORE_HFILES = 
+
+GTKDOC_CFLAGS  =					\
+	-I$(top_srcdir)/libebackend			\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)				\
+	$(E_BACKEND_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/libebackend/libebackend-1.2.la \
+	      $(top_builddir)/libedataserver/libedataserver-1.2.la \
+	      $(E_BACKEND_LIBS)
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+	@echo '*** Scanning header files ***'
+	@-chmod -R u+w $(srcdir)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo '*** Rebuilding template files ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+	@echo '*** Building XML ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo '*** Building HTML ***'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo '-- Fixing Crossreferences' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+endif
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	fi)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+
+.PHONY : dist-hook-local
+

Added: trunk/docs/reference/libebackend/libebackend-docs.xml
==============================================================================
--- (empty file)
+++ trunk/docs/reference/libebackend/libebackend-docs.xml	Tue Apr 29 14:34:35 2008
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
+  <bookinfo>
+    <title>Evolution API Reference: libebackend, backend utility library</title>
+  </bookinfo>
+
+  <chapter>
+    <title>Evolution API Reference: libebackend, backend utility library</title>
+    <xi:include href="xml/e-file-cache.xml"/>
+    <xi:include href="xml/e-dbhash.xml"/>
+    <xi:include href="xml/e-data-server-module.xml"/>
+    <xi:include href="xml/e-db3-utils.xml"/>
+  </chapter>
+</book>

Added: trunk/docs/reference/libebackend/libebackend-sections.txt
==============================================================================
--- (empty file)
+++ trunk/docs/reference/libebackend/libebackend-sections.txt	Tue Apr 29 14:34:35 2008
@@ -0,0 +1,59 @@
+<SECTION>
+<FILE>e-file-cache</FILE>
+EFileCachePrivate
+<TITLE>EFileCache</TITLE>
+EFileCache
+e_file_cache_new
+e_file_cache_remove
+e_file_cache_clean
+e_file_cache_get_object
+e_file_cache_get_objects
+e_file_cache_get_keys
+e_file_cache_add_object
+e_file_cache_replace_object
+e_file_cache_remove_object
+e_file_cache_freeze_changes
+e_file_cache_thaw_changes
+e_file_cache_get_filename
+<SUBSECTION Standard>
+E_FILE_CACHE
+E_IS_FILE_CACHE
+E_TYPE_FILE_CACHE
+e_file_cache_get_type
+E_FILE_CACHE_CLASS
+E_IS_FILE_CACHE_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>e-dbhash</FILE>
+EDbHashStatus
+EDbHash
+EDbHashPrivate
+EDbHashFunc
+e_dbhash_new
+e_dbhash_add
+e_dbhash_remove
+e_dbhash_compare
+e_dbhash_foreach_key
+e_dbhash_write
+e_dbhash_destroy
+</SECTION>
+
+<SECTION>
+<FILE>e-data-server-module</FILE>
+e_data_server_module_init
+e_data_server_get_extensions_for_type
+e_data_server_extension_list_free
+e_data_server_module_remove_unused
+e_data_server_module_add_type
+eds_module_initialize
+eds_module_shutdown
+eds_module_list_types
+</SECTION>
+
+<SECTION>
+<FILE>e-db3-utils</FILE>
+e_db3_utils_maybe_recover
+e_db3_utils_upgrade_format
+</SECTION>
+

Added: trunk/docs/reference/libebackend/libebackend.types
==============================================================================
--- (empty file)
+++ trunk/docs/reference/libebackend/libebackend.types	Tue Apr 29 14:34:35 2008
@@ -0,0 +1,3 @@
+#include <libebackend/e-file-cache.h>
+
+e_file_cache_get_type

Modified: trunk/docs/reference/libedataserver/libedataserver.types
==============================================================================
--- trunk/docs/reference/libedataserver/libedataserver.types	(original)
+++ trunk/docs/reference/libedataserver/libedataserver.types	Tue Apr 29 14:34:35 2008
@@ -1,7 +1,6 @@
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 #include <libedataserver/e-component-listener.h>
-#include <libedataserver/e-file-cache.h>
 #include <libedataserver/e-iterator.h>
 #include <libedataserver/e-list.h>
 #include <libedataserver/e-list-iterator.h>
@@ -12,7 +11,6 @@
 e_account_get_type
 e_account_list_get_type
 e_component_listener_get_type
-e_file_cache_get_type
 e_iterator_get_type
 e_list_get_type
 e_list_iterator_get_type

Added: trunk/libebackend/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/libebackend/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -0,0 +1,40 @@
+INCLUDES =								\
+	-I$(top_srcdir)							\
+	-DG_LOG_DOMAIN=\"e-data-server\"				\
+	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
+	$(DB_CFLAGS)							\
+	$(E_BACKEND_CFLAGS)
+
+lib_LTLIBRARIES = libebackend-1.2.la
+
+libebackend_1_2_la_SOURCES =		\
+	e-data-server-module.c		\
+	e-dbhash.c			\
+	e-db3-utils.c			\
+	e-file-cache.c
+
+libebackend_1_2_la_LIBADD = 				\
+	$(E_BACKEND_LIBS)				\
+	$(DB_LIBS)
+
+libebackend_1_2_la_LDFLAGS = \
+	-version-info $(LIBEBACKEND_CURRENT):$(LIBEBACKEND_REVISION):$(LIBEBACKEND_AGE) $(NO_UNDEFINED)
+
+libebackendincludedir = $(privincludedir)/libebackend
+
+libebackendinclude_HEADERS =		\
+	e-data-server-module.h		\
+	e-db3-utils.h			\
+	e-dbhash.h			\
+	e-file-cache.h
+
+%-$(API_VERSION).pc: %.pc
+	 cp $< $@
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libebackend-$(API_VERSION).pc
+
+EXTRA_DIST = 						\
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+
+DISTCLEANFILES = $(pkgconfig_DATA)

Copied: trunk/libebackend/e-data-server-module.c (from r8670, /trunk/libedataserver/e-data-server-module.c)
==============================================================================
--- /trunk/libedataserver/e-data-server-module.c	(original)
+++ trunk/libebackend/e-data-server-module.c	Tue Apr 29 14:34:35 2008
@@ -28,7 +28,7 @@
 
 #include <gmodule.h>
 
-#include "libedataserver-private.h"
+#include "libedataserver/libedataserver-private.h"
 
 #define E_DATA_SERVER_TYPE_MODULE    	        (e_data_server_module_get_type ())
 #define E_DATA_SERVER_MODULE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_DATA_SERVER_TYPE_MODULE, EDataServerModule))
@@ -263,7 +263,7 @@
 	module_objects = g_list_prepend (module_objects, object);
 }
 
-/**
+/*
  * Unref all loaded modules, so that unused modules are unloaded from the
  * system.
  */

Copied: trunk/libebackend/e-file-cache.c (from r8670, /trunk/libedataserver/e-file-cache.c)
==============================================================================
--- /trunk/libedataserver/e-file-cache.c	(original)
+++ trunk/libebackend/e-file-cache.c	Tue Apr 29 14:34:35 2008
@@ -27,8 +27,8 @@
 #include <glib/gstdio.h>
 
 #include "e-file-cache.h"
-#include "e-data-server-util.h"
-#include "e-xml-hash-utils.h"
+#include "libedataserver/e-data-server-util.h"
+#include "libedataserver/e-xml-hash-utils.h"
 
 struct _EFileCachePrivate {
 	char *filename;

Added: trunk/libebackend/libebackend.pc.in
==============================================================================
--- (empty file)
+++ trunk/libebackend/libebackend.pc.in	Tue Apr 29 14:34:35 2008
@@ -0,0 +1,15 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+datarootdir= datarootdir@
+datadir= datadir@
+
+privincludedir= privincludedir@
+
+Name: libebackend
+Description: Utility library for Evolution Data Server Backends
+Version: @VERSION@
+Requires: glib-2.0
+Libs: -L${libdir} -lbackend- API_VERSION@
+Cflags: -I${privincludedir}

Modified: trunk/libedataserver/Makefile.am
==============================================================================
--- trunk/libedataserver/Makefile.am	(original)
+++ trunk/libedataserver/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -1,7 +1,6 @@
 INCLUDES =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"e-data-server\"				\
-	$(DB_CFLAGS)							\
 	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"				\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"			\
 	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
@@ -18,10 +17,6 @@
 	e-account.c			\
 	e-categories.c			\
 	e-component-listener.c		\
-	e-data-server-module.c		\
-	e-dbhash.c			\
-	e-db3-utils.c			\
-	e-file-cache.c			\
 	e-flag.c			\
 	e-iconv.c			\
 	e-iterator.c			\
@@ -47,7 +42,6 @@
 libedataserver_1_2_la_LIBADD = 				\
 	$(E_DATA_SERVER_LIBS)				\
 	$(ICONV_LIBS)					\
-	$(DB_LIBS)					\
 	$(SOCKET_LIBS)					\
 	$(SOUP_LIBS)
 
@@ -61,10 +55,6 @@
 	e-account.h			\
 	e-categories.h			\
 	e-component-listener.h		\
-	e-data-server-module.h		\
-	e-db3-utils.h			\
-	e-dbhash.h			\
-	e-file-cache.h			\
 	e-flag.h			\
 	e-iconv.h			\
 	e-iterator.h			\

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Apr 29 14:34:35 2008
@@ -57,6 +57,7 @@
 endif
 
 evolution_data_server_LDADD =                     			\
+        $(top_builddir)/libebackend/libebackend-1.2.la			\
         $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la  \
         $(E_DATA_CAL_LIBS)                                      	\
         $(E_FACTORY_LIBS)						\

Modified: trunk/src/server.c
==============================================================================
--- trunk/src/server.c	(original)
+++ trunk/src/server.c	Tue Apr 29 14:34:35 2008
@@ -42,7 +42,7 @@
 #include <bonobo/bonobo-generic-factory.h>
 #include <gconf/gconf-client.h>
 
-#include <libedataserver/e-data-server-module.h>
+#include <libebackend/e-data-server-module.h>
 #include <libedata-book/e-data-book-factory.h>
 #if ENABLE_CALENDAR
 #include <libedata-cal/e-data-cal-factory.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]