--- evolution-exchange-2.30.2/eplugin/Makefile.am.orig	2010-10-15 20:48:00.194832966 -0400
+++ evolution-exchange-2.30.2/eplugin/Makefile.am	2010-10-15 20:48:48.385151008 -0400
@@ -60,7 +60,7 @@
 	exchange-send-options.h
 
 liborg_gnome_exchange_operations_la_LIBADD = \
-	$(top_builddir)/server/storage/libexchange-storage.la \
+        $(top_builddir)/tools/libevolution-exchange-shared.la \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
 	$(EVOLUTION_PLUGIN_LIBS) \
 	$(EVOLUTION_SHELL_LIBS) \
--- evolution-exchange-2.30.2/Makefile.am.orig	2010-10-15 20:50:11.899249279 -0400
+++ evolution-exchange-2.30.2/Makefile.am	2010-03-18 10:15:04.000000000 -0400
@@ -2,8 +2,8 @@
 
 SUBDIRS = \
 	server \
+	tools \
 	eplugin \
-	tools \
 	camel \
 	addressbook \
 	calendar \
