evolution r37343 - in trunk: addressbook addressbook/printing plugins/caldav plugins/google-account-setup plugins/webdav-account-setup

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Feb 26 18:23:33 2009
New Revision: 37343
URL: http://svn.gnome.org/viewvc/evolution?rev=37343&view=rev

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

	** Fixes bug #572950

	* plugins/caldav/Makefile.am:
	* plugins/google-account-setup/Makefile.am:
	* plugins/webdav-account-setup/Makefile.am:
	Fix ordering of -I compiler directives.  Patch by Daniel Macks.

	* addressbook/printing/Makefile.am:
	Remove meaningless GNOME_INCLUDEDIR.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/printing/Makefile.am
   trunk/plugins/caldav/ChangeLog
   trunk/plugins/caldav/Makefile.am
   trunk/plugins/google-account-setup/ChangeLog
   trunk/plugins/google-account-setup/Makefile.am
   trunk/plugins/webdav-account-setup/ChangeLog
   trunk/plugins/webdav-account-setup/Makefile.am

Modified: trunk/addressbook/printing/Makefile.am
==============================================================================
--- trunk/addressbook/printing/Makefile.am	(original)
+++ trunk/addressbook/printing/Makefile.am	Thu Feb 26 18:23:33 2009
@@ -8,7 +8,6 @@
 	e-contact-print.glade
 
 INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
 	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
 	-I$(top_srcdir)/addressbook		\
 	-I$(top_srcdir)/addressbook/backend	\

Modified: trunk/plugins/caldav/Makefile.am
==============================================================================
--- trunk/plugins/caldav/Makefile.am	(original)
+++ trunk/plugins/caldav/Makefile.am	Thu Feb 26 18:23:33 2009
@@ -1,8 +1,8 @@
 INCLUDES = 						\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	-I .						\
 	-I$(top_srcdir)	                                \
-	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		
+	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		\
+	$(EVOLUTION_CALENDAR_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 

Modified: trunk/plugins/google-account-setup/Makefile.am
==============================================================================
--- trunk/plugins/google-account-setup/Makefile.am	(original)
+++ trunk/plugins/google-account-setup/Makefile.am	Thu Feb 26 18:23:33 2009
@@ -1,9 +1,9 @@
 INCLUDES = 						\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	-I .						\
 	-I$(top_srcdir)	                                \
-	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		
+	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 

Modified: trunk/plugins/webdav-account-setup/Makefile.am
==============================================================================
--- trunk/plugins/webdav-account-setup/Makefile.am	(original)
+++ trunk/plugins/webdav-account-setup/Makefile.am	Thu Feb 26 18:23:33 2009
@@ -1,7 +1,7 @@
 INCLUDES = \
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)      \
-	-I .				     \
-	-I$(top_srcdir)
+	-I .				\
+	-I$(top_srcdir)			\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 @EVO_PLUGIN_RULE@