evolution-data-server r9537 - branches/eds-dbus

[rbradford svn gnome org]

Author: rbradford
Date: Fri Sep 12 17:21:15 2008
New Revision: 9537
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9537&view=rev

Log:
2008-09-12  Rob Bradford  <rob linux intel com>

	* Makefile.am:
	* configure.in:
	Disable attempting to build the 'src' directory. The main e-d-s daemon
	is no longer necessary since the services have their own factories.
	However this breaks Evolution since it expects some misc services from
	e-d-s directly. These can either be moved to the factory or added to
	another daemon.

Modified:
   branches/eds-dbus/ChangeLog
   branches/eds-dbus/Makefile.am
   branches/eds-dbus/configure.in

Modified: branches/eds-dbus/Makefile.am
==============================================================================
--- branches/eds-dbus/Makefile.am	(original)
+++ branches/eds-dbus/Makefile.am	Fri Sep 12 17:21:15 2008
@@ -5,8 +5,8 @@
 CALENDAR_DIR = calendar
 endif
 
-SUBDIRS = win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po	
+SUBDIRS = win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po
+DIST_SUBDIRS = win32 libedataserver libebackend servers camel addressbook calendar libedataserverui docs art po
 changelogs =			\
 	ChangeLog
 

Modified: branches/eds-dbus/configure.in
==============================================================================
--- branches/eds-dbus/configure.in	(original)
+++ branches/eds-dbus/configure.in	Fri Sep 12 17:21:15 2008
@@ -1750,7 +1750,6 @@
 servers/google/libgdata/libgdata.pc
 servers/google/libgdata-google/Makefile 
 servers/google/libgdata-google/libgdata-google.pc
-src/Makefile
 win32/Makefile
 docs/Makefile
 docs/reference/Makefile