evolution-data-server r9414 - in branches/EXCHANGE_MAPI_BRANCH: addressbook/backends/galldap addressbook/backends/mapi calendar/backends/mapi servers/mapi

[msuman svn gnome org]

Author: msuman
Date: Thu Aug 21 06:07:47 2008
New Revision: 9414
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9414&view=rev

Log:
Patch from Patrick Ohly  <patrick ohly gmx de>: Include necessary directories for compiling out-of-tree.

Modified:
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h

Modified: branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/galldap/Makefile.am	Thu Aug 21 06:07:47 2008
@@ -1,10 +1,13 @@
 INCLUDES =						\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
-	$(LDAP_CFLAGS)					\
+	-I$(top_builddir)/addressbook			\
 	-I$(top_srcdir)/servers/exchange/storage	\
-	-I$(top_srcdir)/servers/exchange/lib		\	
+	-I$(top_srcdir)/servers/exchange/lib		\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
+	$(LDAP_CFLAGS)					\
 	$(DB_CFLAGS)
 
 # GConf schemas
@@ -32,13 +35,15 @@
 	e-book-backend-galldap.h		
 
 
-libebookbackendgalldap_la_LIBADD = 	\
-	$(DB_LIBS)	\
+libebookbackendgalldap_la_LIBADD = 						\
 	$(top_builddir)/servers/exchange/storage/libexchange-storage-1.2.la	\
 	$(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
+	$(top_builddir)/libebackend/libebackend-1.2.la				\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)						\
+	$(LDAP_LIBS)								\
+	$(DB_LIBS)
 
 libebookbackendgalldap_la_LDFLAGS =	\
 	-module -avoid-version $(NO_UNDEFINED)

Modified: branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/Makefile.am	Thu Aug 21 06:07:47 2008
@@ -4,8 +4,8 @@
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
-	-I$(top_builddir)/servers/mapi			\
-	$(LIBMAPI_CFLAGS)					\
+	-I$(top_srcdir)/servers/mapi			\
+	$(LIBMAPI_CFLAGS)				\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 extension_LTLIBRARIES = libebookbackendmapi.la

Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am	Thu Aug 21 06:07:47 2008
@@ -1,12 +1,20 @@
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"libecalbackendmapi\"	\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)/calendar		\
+	-I$(top_builddir)/calendar		\
+	-I$(top_srcdir)/libical/src		\
+	-I$(top_builddir)/libical/src		\
+	-I$(top_srcdir)/libical/src/libical	\
+	-I$(top_builddir)/libical/src/libical	\
+	-I$(top_srcdir)/servers/mapi		\
+	-I$(top_builddir)/servers/mapi		\
 	$(E_DATA_SERVER_CFLAGS)			\
+	$(LIBEBACKEND_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(LIBECAL_CFLAGS)			\
 	$(LIBEDATACAL_CFLAGS)			\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/libical/src		\
-	-I$(top_srcdir)/servers/mapi		\
 	$(LIBMAPI_CFLAGS)
 
 extension_LTLIBRARIES = libecalbackendmapi.la
@@ -17,12 +25,13 @@
 	e-cal-backend-mapi.c			\
 	e-cal-backend-mapi.h
 
-libecalbackendmapi_la_LIBADD =			\
-	$(E_DATA_SERVER_LIBS)			\
-	$(EVOLUTION_CALENDAR_LIBS)		\
-	$(LIBECAL_LIBS)				\
-	$(LIBEDATACAL_LIBS)			\
+libecalbackendmapi_la_LIBADD =					\
 	$(top_builddir)/servers/mapi/libexchangemapi-1.0.la	\
+	$(E_DATA_SERVER_LIBS)					\
+	$(LIBEBACKEND_LIBS)					\
+	$(EVOLUTION_CALENDAR_LIBS)				\
+	$(LIBECAL_LIBS)						\
+	$(LIBEDATACAL_LIBS)					\
 	$(LIBMAPI_LIBS)
 
 libecalbackendmapi_la_LDFLAGS =			\

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/Makefile.am	Thu Aug 21 06:07:47 2008
@@ -6,6 +6,9 @@
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	-I$(top_srcdir)/calendar		\
 	-I$(top_srcdir)/libical/src		\
+	-I$(top_srcdir)/libical/src/libical	\
+	-I$(top_builddir)/libical/src		\
+	-I$(top_builddir)/libical/src/libical	\
 	$(LIBMAPI_CFLAGS)
 
 

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-cal-utils.h	Thu Aug 21 06:07:47 2008
@@ -32,7 +32,9 @@
 #include "exchange-mapi-utils.h"
 
 #include "exchange-mapi-cal-tz-utils.h"
+#if 0
 #include "exchange-mapi-cal-recur-utils.h"
+#endif
 
 G_BEGIN_DECLS