evolution-data-server r8549 - in trunk/calendar: . backends/caldav libecal libedata-cal

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Mar  3 01:56:35 2008
New Revision: 8549
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8549&view=rev

Log:
2008-03-02  Matthew Bares  <mbarnes redhat com>

	** Fixes bug #518728

	* calendar/backends/caldav/Makefile.am:
	* calendar/libecal/Makefile.am:
	* calendar/libedata-cal/Makefile.am:
	Fix linking order of libecal-1.2 and libedata-cal-1.2.
	Patch by Patrick Ohly.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/backends/caldav/Makefile.am
   trunk/calendar/libecal/Makefile.am
   trunk/calendar/libedata-cal/Makefile.am

Modified: trunk/calendar/backends/caldav/Makefile.am
==============================================================================
--- trunk/calendar/backends/caldav/Makefile.am	(original)
+++ trunk/calendar/backends/caldav/Makefile.am	Mon Mar  3 01:56:35 2008
@@ -19,11 +19,12 @@
 	e-cal-backend-caldav.h		
 
 libecalbackendcaldav_la_LIBADD =						\
-	$(EVOLUTION_CALENDAR_LIBS)      \
-	$(SOUP_LIBS) \
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
 	$(top_builddir)/calendar/libecal/libecal-1.2.la \
-	$(top_builddir)/libedataserver/libedataserver-1.2.la
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(SOUP_LIBS)
+
 
 libecalbackendcaldav_la_LDFLAGS =		\
 	-module -avoid-version

Modified: trunk/calendar/libecal/Makefile.am
==============================================================================
--- trunk/calendar/libecal/Makefile.am	(original)
+++ trunk/calendar/libecal/Makefile.am	Mon Mar  3 01:56:35 2008
@@ -55,11 +55,11 @@
 	e-cal-view-private.h
 
 libecal_1_2_la_LIBADD =									\
-	$(EVOLUTION_CALENDAR_LIBS)							\
 	$(top_builddir)/calendar/libical/src/libical/libical-evolution.la		\
 	$(top_builddir)/calendar/libical/src/libicalvcal/libicalvcal-evolution.la	\
 	$(top_builddir)/calendar/libical/src/libicalss/libicalss-evolution.la		\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS)
 
 libecal_1_2_la_LDFLAGS = 								\
 	-version-info $(LIBECAL_CURRENT):$(LIBECAL_REVISION):$(LIBECAL_AGE) $(NO_UNDEFINED)

Modified: trunk/calendar/libedata-cal/Makefile.am
==============================================================================
--- trunk/calendar/libedata-cal/Makefile.am	(original)
+++ trunk/calendar/libedata-cal/Makefile.am	Mon Mar  3 01:56:35 2008
@@ -46,9 +46,9 @@
 	e-data-cal-view.c
 
 libedata_cal_1_2_la_LIBADD =					\
-	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS)
 
 libedata_cal_1_2_la_LDFLAGS = 								\
 	-version-info $(LIBEDATACAL_CURRENT):$(LIBEDATACAL_REVISION):$(LIBEDATACAL_AGE) $(NO_UNDEFINED)