[evolution-exchange] Fixing some build issues after merge of code from eds

[Milan Crha <mcrha src gnome org>]

commit 862c71e8d3f78d2e8e362229f802a3550b5881d4
Author: Milan Crha <mcrha redhat com>
Date:   Fri Oct 9 10:53:28 2009 +0200

    Fixing some build issues after merge of code from eds

 addressbook/Makefile.am                     |    4 +-
 calendar/Makefile.am                        |    1 +
 camel/Makefile.am                           |    2 +-
 configure.ac                                |    2 +-
 eplugin/Makefile.am                         |    8 +-
 eplugin/org-gnome-exchange-operations.eplug |  114 ------------
 eplugin/org-gnome-exchange-operations.error |  262 ---------------------------
 server/storage/Makefile.am                  |    4 +-
 tools/Makefile.am                           |    4 +-
 9 files changed, 11 insertions(+), 390 deletions(-)
---
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 5fbefae..81b27a3 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -49,11 +49,11 @@ libebookbackendexchange_la_SOURCES = \
 	e-book-backend-gal.h
 
 libebookbackendexchange_la_LIBADD = \
-	$(top_builddir)/server/storage/libexchange-storage.la \
+	$(top_builddir)/tools/libevolution-exchange-shared.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
 if HAVE_LIBDB
-libebookbackendexchange_la_SOURCES = \
+libebookbackendexchange_la_SOURCES += \
 	e-book-backend-db-cache.c \
 	e-book-backend-db-cache.h
 
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index cac0b07..53b3ae2 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -28,6 +28,7 @@ libecalbackendexchange_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 libecalbackendexchange_la_LIBADD = \
+	$(top_builddir)/tools/libevolution-exchange-shared.la \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
 	$(LDAP_LIBS)
 
diff --git a/camel/Makefile.am b/camel/Makefile.am
index ead9f83..155f68a 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -39,7 +39,7 @@ libcamelexchange_la_LDFLAGS = \
 	-avoid-version -module $(NO_UNDEFINED)
 
 libcamelexchange_la_LIBADD = \
-	$(top_builddir)/server/storage/libexchange-storage.la \
+	$(top_builddir)/tools/libevolution-exchange-shared.la \
 	$(EVOLUTION_PLUGIN_LIBS) \
 	$(LDAP_LIBS) \
 	$(SOCKET_LIBS) \
diff --git a/configure.ac b/configure.ac
index 5bb3fc0..9e29c44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,7 @@ case "$host" in
     SOCKET_LIBS='-lws2_32'
     ;;
 *)  os_win32=no
-    NO_UNDEFINED=''
+    NO_UNDEFINED='-no-undefined'
     SOCKET_LIBS=''
     ;;
 esac
diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
index 01a4a0a..b91487d 100644
--- a/eplugin/Makefile.am
+++ b/eplugin/Makefile.am
@@ -1,10 +1,10 @@
 ### EVO_PLUGIN_RULE ### begin ###
 
 %.eplug: %.eplug.in
-	sed -e 's| \ PLUGINDIR \@|$(plugindir)|' \
-	-e 's| \ SOEXT \@|$(SOEXT)|' \
-	-e 's| \ GETTEXT_PACKAGE \@|$(GETTEXT_PACKAGE)|' \
-	-e 's| \ LOCALEDIR \@|$(localedir)|' $< > $@
+	sed -e 's|\ PLUGINDIR\@|$(plugindir)|'		\
+	-e 's|\ SOEXT\@|$(SOEXT)|'			\
+	-e 's|\ GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|'	\
+	-e 's|\ LOCALEDIR\@|$(localedir)|' $< > $@
 
 %.eplug.in: %.eplug.xml
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
diff --git a/server/storage/Makefile.am b/server/storage/Makefile.am
index 7a93c5f..d10cdad 100644
--- a/server/storage/Makefile.am
+++ b/server/storage/Makefile.am
@@ -70,8 +70,6 @@ libexchange_storage_la_LIBADD = \
 	$(SOCKET_LIBS)
 
 libexchange_storage_la_LDFLAGS = \
-	$(KRB5_LIBS) \
-	$(NO_UNDEFINED) \
-	-version-info $(LIBEXCHANGE_STORAGE_CURRENT):$(LIBEXCHANGE_STORAGE_REVISION):$(LIBEXCHANGE_STORAGE_AGE)
+	$(KRB5_LIBS) -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c494138..1b5d6bc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -27,14 +27,12 @@ libevolution_exchange_shared_la_SOURCES = \
 	exchange-share-config-listener.c
 
 libevolution_exchange_shared_la_LIBADD = \
-	$(top_builddir)/server/xntlm/libxntlm.la \
-	$(top_builddir)/server/lib/libexchange.la \
 	$(top_builddir)/server/storage/libexchange-storage.la \
 	$(GNOME_PLATFORM_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
 	$(EVOLUTION_PLUGIN_LIBS)
 
-libevolution_exchange_shared_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_exchange_shared_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 exchange_connector_setup_SOURCES = \
 	ximian-connector-setup.c \