Reference libeshell.la instead of libeshell.a.

2001-05-25  Peter Williams  <peterw@ximian.com>

       * gui/component/Makefile.am: Reference libeshell.la instead of libeshell.a.

2001-05-25  Peter Williams  <peterw@ximian.com>

       * gui/Makefile.am: Reference libeshell.la instead of libeshell.a.

2001-05-25  Peter Williams  <peterw@ximian.com>

       * component/Makefile.am: Reference libeshell.la instead of libeshell.a.

2001-05-25  Peter Williams  <peterw@ximian.com>

       * Makefile.am: Reference libeshell.la instead of libeshell.a.

2001-05-25  Peter Williams  <peterw@ximian.com>

       * Makefile.am: Change libeshell from a noinst_LIBRARIES to
       a lib_LTLIBRARIES. Install its headers in
       $includedir/evolution/shell.

       * evolution-storage.c (safe_corba_string): New, copy of e_safe_corba_string
       in libeutil. This way libeshell doesn't have a missing symbol when programs
       that don't have libeutil link to it.
       (evolution_storage_register): s,e_safe_corba_string,safe_corba_string,g.

svn path=/trunk/; revision=10007

10 files changed, 62 insertions, 22 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 462db8c4aa..ec88caae61 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-25  Peter Williams  <peterw@ximian.com>
+
+	* gui/component/Makefile.am: Reference libeshell.la instead of libeshell.a.
+
 2001-05-25  Christopher James Lahey  <clahey@ximian.com>
 
 	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height):
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index de6e3f2337..e3f444d500 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -43,7 +43,7 @@ evolution_addressbook_SOURCES = 	\
 
 evolution_addressbook_LDADD =						\
 	select-names/libeselectnames.la					\
-	$(top_builddir)/shell/libeshell.a				\
+	$(top_builddir)/shell/libeshell.la				\
 	$(EXTRA_GNOME_LIBS)						\
 	$(BONOBO_HTML_GNOME_LIBS)					\
 	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8c306f76a5..f21839540b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-25  Peter Williams  <peterw@ximian.com>
+
+	* gui/Makefile.am: Reference libeshell.la instead of libeshell.a.
+
 2001-05-23  Federico Mena Quintero  <federico@ximian.com>
 
 	* gui/dialogs/recurrence-page.c: Finished porting from the old
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 292e1ebd28..29bb739a56 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -113,7 +113,7 @@ evolution_calendar_SOURCES =			\
 
 evolution_calendar_LDADD =								\
 	alarm-notify/libalarm.a								\
-	$(top_builddir)/shell/libeshell.a						\
+	$(top_builddir)/shell/libeshell.la						\
 	$(top_builddir)/calendar/cal-client/libcal-client.la				\
 	$(top_builddir)/calendar/cal-util/libcal-util.la				\
 	$(top_builddir)/e-util/libeutil.la						\
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index a275685d66..cfc07e9ad9 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-25  Peter Williams  <peterw@ximian.com>
+
+	* component/Makefile.am: Reference libeshell.la instead of libeshell.a.
+
 2001-05-23  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* component/e-summary-url.c: Mark a string for translation.
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e675707991..a5a1b9d628 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-25  Peter Williams  <peterw@ximian.com>
+
+	* Makefile.am: Reference libeshell.la instead of libeshell.a.
+
 2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* folder-browser-factory.c (control_activate): Disable Resend on
diff --git a/mail/Makefile.am b/mail/Makefile.am
index ce4e10d621..efb646be08 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -102,7 +102,7 @@ evolution_mail_SOURCES =		\
 
 evolution_mail_LDADD = 					\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/shell/libeshell.a		\
+	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/composer/libcomposer.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
 	$(top_builddir)/camel/libcamel.la		\
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 607a33b44b..dfb7c4ace8 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2001-05-25  Peter Williams  <peterw@ximian.com>
+
+	* Makefile.am: Change libeshell from a noinst_LIBRARIES to
+	a lib_LTLIBRARIES. Install its headers in 
+	$includedir/evolution/shell.
+
+	* evolution-storage.c (safe_corba_string): New, copy of e_safe_corba_string
+	in libeutil. This way libeshell doesn't have a missing symbol when programs
+	that don't have libeutil link to it.
+	(evolution_storage_register): s,e_safe_corba_string,safe_corba_string,g.
+
 2001-05-25  jacob berkman  <jacob@ximian.com>
 
 	* e-shell-view.c (setup_widgets): place the shortcut bar in a
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8cd1c9c3ef..2b9ba7a20e 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -47,33 +47,39 @@ idl_DATA = $(IDLS)
 
 # Shell library
 
-noinst_LIBRARIES =	\
-	libeshell.a
+lib_LTLIBRARIES =	\
+	libeshell.la
 
-libeshell_a_SOURCES = 				\
+eshellincludedir = $(includedir)/evolution/shell
+
+eshellinclude_HEADERS = 			\
+	Evolution.h				\
+	e-folder-tree.h				\
+	evolution-local-storage.h		\
+	evolution-session.h			\
+	evolution-shell-client.h		\
+	evolution-shell-component-client.h	\
+	evolution-shell-component.h		\
+	evolution-shell-component-dnd.h		\
+	evolution-shell-view.h			\
+	evolution-storage-listener.h		\
+	evolution-storage-set-view-listener.h	\
+	evolution-storage.h
+
+libeshell_la_SOURCES = 				\
 	$(IDL_GENERATED)			\
 	e-folder-tree.c				\
-	e-folder-tree.h				\
 	evolution-local-storage.c		\
-	evolution-local-storage.h		\
 	evolution-session.c			\
-	evolution-session.h			\
 	evolution-shell-client.c		\
-	evolution-shell-client.h		\
 	evolution-shell-component-client.c	\
-	evolution-shell-component-client.h	\
 	evolution-shell-component.c		\
-	evolution-shell-component.h		\
 	evolution-shell-component-dnd.c		\
-	evolution-shell-component-dnd.h		\
 	evolution-shell-view.c			\
-	evolution-shell-view.h			\
 	evolution-storage-listener.c		\
-	evolution-storage-listener.h		\
 	evolution-storage-set-view-listener.c	\
-	evolution-storage-set-view-listener.h	\
 	evolution-storage.c			\
-	evolution-storage.h
+	$(eshellinclude_HEADERS)
 
 # Evolution executable
 
@@ -138,7 +144,7 @@ evolution_SOURCES =				\
 	main.c
 
 evolution_LDADD =						\
-	libeshell.a						\
+	libeshell.la						\
 	importer/libevolution-importer.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a		\
 	$(top_builddir)/e-util/libeutil.la			\
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index 20b4372cd5..e965c71a2a 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -33,8 +33,6 @@
 
 #include "Evolution.h"
 
-#include "e-util/e-corba-utils.h"
-
 #include "e-folder-tree.h"
 
 #include "evolution-storage.h"
@@ -75,6 +73,15 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 /* Utility functions.  */
 
+static const CORBA_char *
+safe_corba_string (const char *s)
+{
+        if (s == NULL)
+                return (CORBA_char *) "";
+
+        return s;
+}
+
 static void
 list_through_listener_foreach (EFolderTree *tree,
 			       const char *path,
@@ -611,8 +618,8 @@ evolution_storage_register (EvolutionStorage *evolution_storage,
 	corba_storage_listener = GNOME_Evolution_StorageRegistry_addStorage (corba_storage_registry,
 									     corba_storage,
 									     priv->name,
-									     e_safe_corba_string (priv->toplevel_node_uri),
-									     e_safe_corba_string (priv->toplevel_node_type),
+									     safe_corba_string (priv->toplevel_node_uri),
+									     safe_corba_string (priv->toplevel_node_type),
 									     &ev);
 
 	if (ev._major == CORBA_NO_EXCEPTION) {