evolution-exchange r1892 - in trunk: . addressbook calendar mail storage

[tobiasmue svn gnome org]

Author: tobiasmue
Date: Fri Mar  6 02:03:10 2009
New Revision: 1892
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1892&view=rev

Log:
2009-03-06  Tobias Mueller  <tobiasmue gnome org>

    * mail/Makefile.am:
    * addressbook/Makefile.am:
    * storage/Makefile.am:
    * calendar/Makefile.am:
    Changed order of the libs to link against to not pull system libs

    ** Fixes bug #572950 (Patch by Daniel Macks)



Modified:
   trunk/ChangeLog
   trunk/addressbook/Makefile.am
   trunk/calendar/Makefile.am
   trunk/mail/Makefile.am
   trunk/storage/Makefile.am

Modified: trunk/addressbook/Makefile.am
==============================================================================
--- trunk/addressbook/Makefile.am	(original)
+++ trunk/addressbook/Makefile.am	Fri Mar  6 02:03:10 2009
@@ -1,9 +1,9 @@
 INCLUDES =						\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/storage				\
 	-DG_LOG_DOMAIN=\"e-book-backend-exchange\"	\
 	$(ADDRESSBOOK_CFLAGS)				\
 	$(LIBEXCHANGE_CFLAGS)				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/storage				\
 	$(LDAP_CFLAGS)					
 
 if HAVE_LIBDB	

Modified: trunk/calendar/Makefile.am
==============================================================================
--- trunk/calendar/Makefile.am	(original)
+++ trunk/calendar/Makefile.am	Fri Mar  6 02:03:10 2009
@@ -1,9 +1,9 @@
 INCLUDES =                                                      \
+	-I$(top_srcdir)						\
+        -I$(top_srcdir)/storage					\
 	$(CALENDAR_CFLAGS)					\
 	$(LIBEXCHANGE_CFLAGS)					\
 	$(LDAP_CFLAGS)						\
-	-I$(top_srcdir)						\
-        -I$(top_srcdir)/storage					\
 	-DG_LOG_DOMAIN=\"e-cal-backend-exchange\"
 
 noinst_LTLIBRARIES =						\

Modified: trunk/mail/Makefile.am
==============================================================================
--- trunk/mail/Makefile.am	(original)
+++ trunk/mail/Makefile.am	Fri Mar  6 02:03:10 2009
@@ -5,12 +5,12 @@
 INCLUDES =							\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/camel					\
+	-I$(top_srcdir)/storage  				\
 	-DG_LOG_DOMAIN=\"exchange-mail\"			\
 	$(EXTRA_GNOME_CFLAGS)					\
 	$(BONOBO_GNOME_CFLAGS)					\
 	$(MAIL_CFLAGS)						\
 	$(LIBEXCHANGE_CFLAGS)					\
-	-I$(top_srcdir)/storage  				\
 	$(LDAP_CFLAGS)						
 
 libexchangemail_la_SOURCES =					\

Modified: trunk/storage/Makefile.am
==============================================================================
--- trunk/storage/Makefile.am	(original)
+++ trunk/storage/Makefile.am	Fri Mar  6 02:03:10 2009
@@ -1,4 +1,8 @@
 INCLUDES =							\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/mail					\
+	-I$(top_srcdir)/camel					\
+	-I$(top_srcdir)/calendar				\
 	-DG_LOG_DOMAIN=\"evolution-exchange-storage\"		\
 	$(LIBEXCHANGE_CFLAGS)				\
 	$(EXCHANGE_STORAGE_CFLAGS)				\
@@ -10,11 +14,7 @@
 	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\"			\
 	-DCONNECTOR_IMAGESDIR=\""$(imagesdir)"\"		\
 	-DCONNECTOR_UIDIR=\""$(uidir)"\"			\
-	-DCONNECTOR_LOCALEDIR=\""$(localedir)\""		\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/mail					\
-	-I$(top_srcdir)/camel					\
-	-I$(top_srcdir)/calendar
+	-DCONNECTOR_LOCALEDIR=\""$(localedir)\""
 
 EVOLUTION_privlibexec_PROGRAMS =				\
 	evolution-exchange-storage