evolution r35300 - branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi

[jjohnny svn gnome org]

Author: jjohnny
Date: Tue Apr  1 18:11:44 2008
New Revision: 35300
URL: http://svn.gnome.org/viewvc/evolution?rev=35300&view=rev

Log:
Removed references to libexchange-storage


Modified:
   branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am

Modified: branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/plugins/exchange-mapi/Makefile.am	Tue Apr  1 18:11:44 2008
@@ -4,10 +4,12 @@
 	-I$(top_srcdir)/calendar 			\
 	-I$(top_builddir)/composer 			\
 	-I$(top_builddir)/mail 				\
-	$(CAMEL_EXCHANGE_CFLAGS) 			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" 		\
 	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\" 		\
 	-DLIBAMPI_LDIF_DIR=\""$(libmapi_ldif_dir)"\"	\
+	$(CAMEL_CFLAGS)					\
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(LIBMAPI_CFLAGS)
 
 
@@ -27,9 +29,10 @@
 	$(top_builddir)/calendar/gui/libevolution-calendar.la 	\
 	$(top_builddir)/mail/libevolution-mail.la 		\
 	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
-	$(CAMEL_EXCHANGE_LIBS) \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(CAMEL_LIBS) \
 	$(LIBMAPI_LIBS)
-# ^ has to be removed
 
 liborg_gnome_exchange_mapi_la_LDFLAGS = -module -avoid-version -lmapi $(NO_UNDEFINED)
 liborg_gnome_exchange_mapi_la_CFLAGS = -I/usr/local/samba/include/