revert previous change

svn path=/trunk/; revision=19968

16 files changed, 33 insertions, 57 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		\
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2ec5b93c20..827cd63501 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,18 +1,3 @@
-2003-02-19  Dan Winship  <danw@ximian.com>
-
-	* cal-client/Makefile.am (client_test_LDADD): Remove libversit. We
-	haven't depended on that in forever.
-
-	* cal-util/Makefile.am (test_recur_LDADD): Likewise
-
-	* gui/alarm-notify/Makefile.am: build libalarm as a shared library
-	instead of static.
-
-	* gui/dialogs/Makefile.am: likewise for libcal-dialogs
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): update for
-	that.
-
 2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
 
 	* pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 627b7f19e5..b7ffe15af7 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -81,6 +81,7 @@ client_test_LDADD =							\
 	$(EVOLUTION_CALENDAR_LIBS)					\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/calendar/cal-util/libcal-util.la		\
+	$(top_builddir)/libversit/libversit.a				\
 	$(top_builddir)/libical/src/libical/libical-evolution.la	\
 	$(top_builddir)/libwombat/libwombat.la				\
 	libcal-client.la
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index b8cb867244..963dee5d1f 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -61,6 +61,7 @@ test_recur_SOURCES = 	\
 
 test_recur_LDADD = 							\
 	 libcal-util.la							\
+	 $(top_builddir)/libversit/libversit.a				\
 	 $(top_builddir)/libical/src/libical/libical-evolution.la	\
 	 $(EVOLUTION_CALENDAR_LIBS)
 
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 320e452464..5836bb69ae 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -181,7 +181,7 @@ libevolution_calendar_la_SOURCES =		\
 	weekday-picker.h
 
 libevolution_calendar_la_LIBADD =							\
-	alarm-notify/libalarm.la								\
+	alarm-notify/libalarm.a								\
 	$(DB3_LDADD)									\
 	$(top_builddir)/widgets/menus/libmenus.la					\
 	$(top_builddir)/shell/libeshell.la						\
@@ -194,7 +194,7 @@ libevolution_calendar_la_LIBADD =							\
 	$(top_builddir)/camel/libcamel.la						\
 	$(top_builddir)/libversit/libversit.a						\
 	$(top_builddir)/e-util/ename/libename.la					\
-	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la				\
+	dialogs/libcal-dialogs.a							\
 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a					\
 	$(EVOLUTION_CALENDAR_LIBS)
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 7cc779f680..d772d88030 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -16,9 +16,9 @@ $(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
 
 privlibexec_PROGRAMS = evolution-alarm-notify
 
-noinst_LTLIBRARIES = libalarm.la
+noinst_LIBRARIES = libalarm.a
 
-libalarm_la_SOURCES =	\
+libalarm_a_SOURCES =	\
 	alarm.c		\
 	alarm.h
 
@@ -53,7 +53,7 @@ evolution_alarm_notify_SOURCES =	\
 	save.h
 
 evolution_alarm_notify_LDADD =						\
-	libalarm.la							\
+	libalarm.a							\
 	$(top_builddir)/calendar/cal-client/libcal-client.la		\
 	$(top_builddir)/calendar/cal-util/libcal-util.la		\
 	$(top_builddir)/libical/src/libical/libical-evolution.la	\
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 32a6a8bf9f..a4ffff5f17 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -34,9 +34,9 @@ INCLUDES = 								\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
-noinst_LTLIBRARIES = libcal-dialogs.la
+noinst_LIBRARIES = libcal-dialogs.a
 
-libcal_dialogs_la_SOURCES =	\
+libcal_dialogs_a_SOURCES =	\
 	$(IDL_GENERATED)	\
 	alarm-options.c		\
 	alarm-options.h		\
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 40f2b199ad..ef383c0cc3 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,7 +1,5 @@
 2003-02-19  Dan Winship  <danw@ximian.com>
 
-	* Makefile.am (summary_libs): s/libalarm.a/libalarm.la/
-
 	* e-summary-rdf.c: Declare xmlSubstituteEntitiesDefaultValue
 	extern.
 	(message_finished): And set its value here. Fixes a duplicate
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index b2be84d1a5..e86b7c9e5f 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -65,7 +65,7 @@ summary_sources =				\
 	weather.h
 
 summary_libs =				 				\
-	$(top_builddir)/calendar/gui/alarm-notify/libalarm.la		\
+	$(top_builddir)/calendar/gui/alarm-notify/libalarm.a		\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a			\
 	$(top_builddir)/e-util/libeutil.la				\