revert previous change

svn path=/trunk/; revision=19968

8 files changed, 23 insertions, 32 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c3f2a2a953..d6f7c1b890 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,14 +1,5 @@
 2003-02-19  Dan Winship  <danw@ximian.com>
 
-	* gui/component/Makefile.am:
-	* gui/contact-editor/Makefile.am:
-	* gui/contact-list-editor/Makefile.am:
-	* gui/search/Makefile.am:
-	* gui/widgets/Makefile.am:
-	* printing/Makefile.am: Build the subparts as (noinst) shared
-	libraries rather than static libraries, so they can be portably
-	linked into libevolution-addressbook.so
-
 	* gui/widgets/e-addressbook-model.c: Make parent_class static.
 
 	* gui/widgets/e-addressbook-reflow-adapter.c: Likewise
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index d9a210a0ae..d53fb4c7ac 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.la				\
-	$(top_builddir)/addressbook/printing/libecontactprint.la			\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.la			\
+	$(top_builddir)/addressbook/gui/widgets/libeminicard.a				\
+	$(top_builddir)/addressbook/printing/libecontactprint.a				\
+	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a			\
 	$(top_builddir)/filter/libfilter.la						\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la				\
 	$(top_builddir)/camel/libcamel.la						\
 	$(top_builddir)/e-util/ename/libename.la					\
-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
+	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a	\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a		\
 	$(top_builddir)/libversit/libversit.a						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 					\
 	$(top_builddir)/addressbook/gui/merging/libecardmerging.a			\
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 24625865e8..01ec18265a 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_LTLIBRARIES = 				\
-	libecontacteditor.la
+noinst_LIBRARIES =				\
+	libecontacteditor.a
 
-libecontacteditor_la_SOURCES = 			\
+libecontacteditor_a_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 278b2e528f..6a3a21728a 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_LTLIBRARIES = 				\
-	libecontactlisteditor.la
+noinst_LIBRARIES =				\
+	libecontactlisteditor.a
 
-libecontactlisteditor_la_SOURCES = 		\
+libecontactlisteditor_a_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 e032cd639d..4c57316e8c 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_LTLIBRARIES = 				\
-	libecardmerging.la
+noinst_LIBRARIES =				\
+	libecardmerging.a
 
-libecardmerging_la_SOURCES =			\
+libecardmerging_a_SOURCES =			\
 	e-card-merging.c			\
 	e-card-merging.h
 
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index 89d55c49bc..bdf90e99ea 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_LTLIBRARIES = 				\
-	libeaddressbooksearch.la
+noinst_LIBRARIES =				\
+	libeaddressbooksearch.a
 
-libeaddressbooksearch_la_SOURCES =		\
+libeaddressbooksearch_a_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 be4bdf49bb..44938fb100 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -17,10 +17,10 @@ INCLUDES =										\
 	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LTLIBRARIES =				\
-	libeminicard.la
+noinst_LIBRARIES =				\
+	libeminicard.a
 
-libeminicard_la_SOURCES =			\
+libeminicard_a_SOURCES =			\
 	e-addressbook-marshal.c			\
 	e-addressbook-reflow-adapter.c		\
 	e-addressbook-reflow-adapter.h		\
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 07d4f6a87e..67868ac237 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -18,10 +18,10 @@ INCLUDES =					\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_LTLIBRARIES = 				\
-	libecontactprint.la
+noinst_LIBRARIES =				\
+	libecontactprint.a
 
-libecontactprint_la_SOURCES = 			\
+libecontactprint_a_SOURCES = 			\
 	e-contact-print-envelope.c		\
 	e-contact-print-envelope.h		\
 	e-contact-print-style-editor.c		\