evolution-data-server r10105 - in trunk: calendar calendar/backends/caldav servers/exchange servers/exchange/lib servers/exchange/storage

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Feb 26 17:56:06 2009
New Revision: 10105
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10105&view=rev

Log:
2009-02-26  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #572950

	* servers/exchange/lib/Makefile.am:
	* servers/exchange/storage/Makefile.am:
	* calendar/backends/caldav/Makefile.am:
	Fix ordering of -I compiler directives.  Patch by Daniel Macks.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/backends/caldav/Makefile.am
   trunk/servers/exchange/ChangeLog
   trunk/servers/exchange/lib/Makefile.am
   trunk/servers/exchange/storage/Makefile.am

Modified: trunk/calendar/backends/caldav/Makefile.am
==============================================================================
--- trunk/calendar/backends/caldav/Makefile.am	(original)
+++ trunk/calendar/backends/caldav/Makefile.am	Thu Feb 26 17:56:06 2009
@@ -1,27 +1,26 @@
-INCLUDES =                                                      \
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/calendar                                \
-	-I$(top_builddir)/calendar                              \
-	$(SOUP_CFLAGS)					        \
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(SOUP_CFLAGS) \
 	-DG_LOG_DOMAIN=\"e-cal-backend-caldav\"
 
 extension_LTLIBRARIES = libecalbackendcaldav.la
 
-libecalbackendcaldav_la_SOURCES =	\
-	e-cal-backend-caldav-factory.c	\
-	e-cal-backend-caldav-factory.h	\
-	e-cal-backend-caldav.c		\
-	e-cal-backend-caldav.h		
+libecalbackendcaldav_la_SOURCES = \
+	e-cal-backend-caldav-factory.c \
+	e-cal-backend-caldav-factory.h \
+	e-cal-backend-caldav.c \
+	e-cal-backend-caldav.h
 
-libecalbackendcaldav_la_LIBADD =						\
+libecalbackendcaldav_la_LIBADD = \
 	$(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)/libebackend/libebackend-1.2.la			\
+	$(top_builddir)/libebackend/libebackend-1.2.la \
 	$(EVOLUTION_CALENDAR_LIBS) \
 	$(SOUP_LIBS)
 
-
-libecalbackendcaldav_la_LDFLAGS =		\
+libecalbackendcaldav_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)

Modified: trunk/servers/exchange/lib/Makefile.am
==============================================================================
--- trunk/servers/exchange/lib/Makefile.am	(original)
+++ trunk/servers/exchange/lib/Makefile.am	Thu Feb 26 17:56:06 2009
@@ -2,13 +2,13 @@
 
 INCLUDES =                                                      \
 	-DCONNECTOR_PREFIX=\""$(prefix)"\"			\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/servers/exchange/xntlm			\
 	$(LDAP_CFLAGS)						\
 	$(KRB5_CFLAGS)						\
 	$(SOUP_CFLAGS)						\
 	$(E_DATA_SERVER_CFLAGS)					\
-	$(E_DATA_SERVER_UI_CFLAGS)				\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/servers/exchange/xntlm
+	$(E_DATA_SERVER_UI_CFLAGS)
 
 noinst_LTLIBRARIES =						\
 	libexchange.la

Modified: trunk/servers/exchange/storage/Makefile.am
==============================================================================
--- trunk/servers/exchange/storage/Makefile.am	(original)
+++ trunk/servers/exchange/storage/Makefile.am	Thu Feb 26 17:56:06 2009
@@ -13,15 +13,15 @@
 	-DLIBDIR=\""$(datadir)"\"	 			\
 	-DCONNECTOR_LOCALEDIR=\""$(localedir)\""		\
 	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\"			\
+	-I$(top_builddir)/servers/exchange/lib			\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/servers/exchange/lib			\
+	-I$(top_srcdir)/servers/exchange/xntlm			\
 	$(KRB5_CFLAGS)						\
 	$(LDAP_CFLAGS)						\
 	$(SOUP_CFLAGS)						\
 	$(E_DATA_SERVER_CFLAGS)					\
-	$(E_DATA_SERVER_UI_CFLAGS)				\
-	-I$(top_builddir)/servers/exchange/lib			\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/servers/exchange/lib			\
-	-I$(top_srcdir)/servers/exchange/xntlm
+	$(E_DATA_SERVER_UI_CFLAGS)
 
 lib_LTLIBRARIES =						\
 	libexchange-storage-1.2.la