[evolution-patches] calendar and conduit patches for darwin

[Dan Winship <danw ximian com>]

Two things I could have sworn we fixed for 1.2.x...

The calendar change makes it not compile evolution-calendar.idl into
libevolution-calendar, because it's already in libcal-client (and
darwin's linker will complain about duplicate symbols).

The conduit change makes the addressbook conduit not use
libeconduit-static, paralleling the change already made to the calendar
and todo conduits. [The reason this is needed is that darwin gets
annoyed when you try to create a static archive with no members, which
will happen if you configure without pilot support.]

JP: If we can get rid of libeconduit-static, we should be able to get
rid of *all* of the -static libs, right? [libebook-static,
libcal-client-static, libcal-util-static, libcamel-static,
libename-static, libeutil-static, and libical-static]. Should I try that
out on HEAD?


Index: calendar//ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1802.2.31
diff -u -r1.1802.2.31 ChangeLog
--- calendar//ChangeLog	28 Aug 2003 14:31:49 -0000	1.1802.2.31
+++ calendar//ChangeLog	4 Sep 2003 20:11:13 -0000
@@ -1,3 +1,8 @@
+2003-09-04  Dan Winship  <danw ximian com>
+
+	* gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl
+	here. It's already in libcal-client.
+
 2003-08-27  Hans Petter Jansson  <hpj ximian com>
 
 	Fixes #29032.
Index: calendar//gui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/Makefile.am,v
retrieving revision 1.268
diff -u -r1.268 Makefile.am
--- calendar//gui/Makefile.am	11 Jun 2003 04:09:29 -0000	1.268
+++ calendar//gui/Makefile.am	4 Sep 2003 20:11:14 -0000
@@ -37,23 +37,7 @@
 $(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H)
 
 
-# Calendar IDL files
-
-CALENDAR_IDL_GENERATED_H =                 		\
-	evolution-calendar.h
-CALENDAR_IDL_GENERATED_C =                 		\
-	evolution-calendar-common.c			\
-	evolution-calendar-skels.c			\
-	evolution-calendar-stubs.c
-CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H)
-
-$(CALENDAR_IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(top_srcdir)/calendar/idl/evolution-calendar.idl
-$(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H)
-
-
-IDL_GENERATED = $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(CALENDAR_IDL_GENERATED)
+IDL_GENERATED = $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED)
 
 
 SUBDIRS = alarm-notify dialogs

Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.398.2.5
diff -u -r1.398.2.5 ChangeLog
--- e-util/ChangeLog	28 Aug 2003 18:19:11 -0000	1.398.2.5
+++ e-util/ChangeLog	4 Sep 2003 20:10:59 -0000
@@ -1,3 +1,8 @@
+2003-09-04  Dan Winship  <danw ximian com>
+
+	* Makefile.am: Kill off libeconduit-static: it was only needed for
+	libtool 1.3.
+
 2003-08-28  Jeffrey Stedfast  <fejj ximian com>
 
 	* e-mktemp.c (e_mktemp_cleanup): We need to unlink the full paths
Index: e-util/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v
retrieving revision 1.92
diff -u -r1.92 Makefile.am
--- e-util/Makefile.am	12 Jun 2003 21:13:49 -0000	1.92
+++ e-util/Makefile.am	4 Sep 2003 20:10:59 -0000
@@ -16,7 +16,7 @@
 	$(E_UTIL_CFLAGS)
 
 privlib_LTLIBRARIES = libeutil.la libedb3util.la libeconduit.la
-noinst_LTLIBRARIES = libeutil-static.la libeconduit-static.la
+noinst_LTLIBRARIES = libeutil-static.la
 
 eutilinclude_HEADERS = 				\
 	e-account-list.h			\
@@ -132,9 +132,6 @@
 endif
 
 libeconduit_la_SOURCES = $(pilot_compile)
-
-libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES)
-libeconduit_static_la_LDFLAGS = -all-static
 
 EXTRA_DIST =				\
 	$(pilot_sources)		\
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1435.2.8
diff -u -r1.1435.2.8 ChangeLog
--- addressbook/ChangeLog	26 Aug 2003 17:45:51 -0000	1.1435.2.8
+++ addressbook/ChangeLog	4 Sep 2003 20:10:59 -0000
@@ -1,3 +1,8 @@
+2003-09-04  Dan Winship  <danw ximian com>
+
+	* conduit/Makefile.am (libeaddress_conduit_la_LIBADD):
+	s/libeconduit-static/libeconduit/
+
 2003-08-26  JP Rosevear  <jpr ximian com>
 
 	* conduit/address-conduit.c (ecard_from_remote_record): duplicate
Index: addressbook/conduit/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/conduit/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- addressbook/conduit/Makefile.am	27 Feb 2003 23:05:39 -0000	1.33
+++ addressbook/conduit/Makefile.am	4 Sep 2003 20:10:59 -0000
@@ -21,7 +21,7 @@
 	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
 	$(top_builddir)/e-util/ename/libename-static.la			\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
+	$(top_builddir)/e-util/libeconduit.la		 		\
 	$(top_builddir)/camel/libcamel.la	 			\
 	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)