Build libecontacteditor as an uninstalled shared library.

	* gui/contact-editor/Makefile.am: Build libecontacteditor as an
	uninstalled shared library.

	* gui/contact-list-editor/Makefile.am: Likewise for
	libecontactlisteditor

	* gui/merging/Makefile.am: and libecardmerging

	* gui/search/Makefile.am: and libeaddressbooksearch

	* gui/widgets/Makefile.am: and libeminicard

	* printing/Makefile.am: and libecontactprint

	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
	Update for new library names (and get rid of libtool portability
	warnings).

svn path=/trunk/; revision=20112

8 files changed, 46 insertions, 26 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 23ee36d6e8..0ef7235111 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,25 @@
 2003-02-28  Dan Winship  <danw@ximian.com>
 
+	* gui/contact-editor/Makefile.am: Build libecontacteditor as an
+	uninstalled shared library.
+
+	* gui/contact-list-editor/Makefile.am: Likewise for
+	libecontactlisteditor
+
+	* gui/merging/Makefile.am: and libecardmerging
+
+	* gui/search/Makefile.am: and libeaddressbooksearch
+
+	* gui/widgets/Makefile.am: and libeminicard
+
+	* printing/Makefile.am: and libecontactprint
+
+	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
+	Update for new library names (and get rid of libtool portability
+	warnings).
+
+2003-02-28  Dan Winship  <danw@ximian.com>
+
 	* backend/ebook/e-card.c (e_card_list_send, e_card_send): Remove
 	these from here; talking to the mailer doesn't really belong at
 	the libebook level anyway.
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 8d50c74ee6..5a67f4d9d4 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -48,15 +48,15 @@ libevolution_addressbook_la_SOURCES = 	\
 libevolution_addressbook_la_LIBADD =							\
 	select-names/libeselectnames.la							\
 	$(top_builddir)/shell/libeshell.la						\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a				\
-	$(top_builddir)/addressbook/printing/libecontactprint.a				\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a			\
+	$(top_builddir)/addressbook/gui/widgets/libeminicard.la				\
+	$(top_builddir)/addressbook/printing/libecontactprint.la			\
+	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.la			\
 	$(top_builddir)/filter/libfilter.la						\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la				\
-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a	\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a		\
+	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
-	$(top_builddir)/addressbook/gui/merging/libecardmerging.a			\
+	$(top_builddir)/addressbook/gui/merging/libecardmerging.la			\
 	$(top_builddir)/widgets/menus/libmenus.la					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 01ec18265a..fdbb1a71b9 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -17,10 +17,10 @@ INCLUDES =						\
 	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LIBRARIES =				\
-	libecontacteditor.a
+noinst_LTLIBRARIES =				\
+	libecontacteditor.la
 
-libecontacteditor_a_SOURCES = 			\
+libecontacteditor_la_SOURCES = 			\
 	e-contact-editor-address.c		\
 	e-contact-editor-address.h		\
 	e-contact-editor-fullname.c		\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 6a3a21728a..32a08533d7 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -18,10 +18,10 @@ INCLUDES =						\
 	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LIBRARIES =				\
-	libecontactlisteditor.a
+noinst_LTLIBRARIES =				\
+	libecontactlisteditor.la
 
-libecontactlisteditor_a_SOURCES = 		\
+libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-editor.c			\
 	e-contact-list-editor.h			\
 	e-contact-list-editor-marshal.c		\
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 4c57316e8c..f30edd5745 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -10,10 +10,10 @@ INCLUDES =						\
 	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LIBRARIES =				\
-	libecardmerging.a
+noinst_LTLIBRARIES =				\
+	libecardmerging.la
 
-libecardmerging_a_SOURCES =			\
+libecardmerging_la_SOURCES =			\
 	e-card-merging.c			\
 	e-card-merging.h
 
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index bdf90e99ea..bdd56e2001 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -19,9 +19,9 @@ INCLUDES =						\
 	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LIBRARIES =				\
-	libeaddressbooksearch.a
+noinst_LTLIBRARIES =				\
+	libeaddressbooksearch.la
 
-libeaddressbooksearch_a_SOURCES =		\
+libeaddressbooksearch_la_SOURCES =		\
 	e-addressbook-search-dialog.c		\
 	e-addressbook-search-dialog.h
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index aa9d26e067..0626acee52 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -34,10 +34,10 @@ CORBA_SOURCE_H = $(CORBA_COMPOSER_SOURCE_H)
 CORBA_SOURCE_C = $(CORBA_COMPOSER_SOURCE_C)
 CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C)
 
-noinst_LIBRARIES =				\
-	libeminicard.a
+noinst_LTLIBRARIES =				\
+	libeminicard.la
 
-libeminicard_a_SOURCES =			\
+libeminicard_la_SOURCES =			\
 	$(CORBA_SOURCE)				\
 	e-addressbook-marshal.c			\
 	e-addressbook-reflow-adapter.c		\
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 15871b005b..b28d841ec2 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -18,10 +18,10 @@ INCLUDES =					\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LIBRARIES =				\
-	libecontactprint.a
+noinst_LTLIBRARIES =				\
+	libecontactprint.la
 
-libecontactprint_a_SOURCES = 			\
+libecontactprint_la_SOURCES = 			\
 	e-contact-print-envelope.c		\
 	e-contact-print-envelope.h		\
 	e-contact-print-style-editor.c		\
@@ -39,7 +39,7 @@ contact_print_test_SOURCES = 	\
 
 contact_print_test_LDADD =	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	libecontactprint.a					\
+	libecontactprint.la					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 contact_print_style_editor_test_SOURCES = 	\
@@ -47,7 +47,7 @@ contact_print_style_editor_test_SOURCES = 	\
 
 contact_print_style_editor_test_LDADD =	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	libecontactprint.a					\
+	libecontactprint.la					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)