* use AM_CPPFLAGS instead of INCLUDES

lib/Makefile.am

@@ -26,7 +26,7 @@ else
 crypto=
 endif
 
-INCLUDES=$(XAPIAN_CXXFLAGS) $(GMIME_CFLAGS) $(GLIB_CFLAGS) $(GUILE_CFLAGS)
+AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) $(GMIME_CFLAGS) $(GLIB_CFLAGS) $(GUILE_CFLAGS)
 
 # don't use -Werror, as it might break on other compilers
 # use -Wno-unused-parameters, because some callbacks may not

lib/mu-container.c

@@ -432,8 +432,10 @@ mu_container_dump (MuContainer *c, gboolean recursive)
 	if (!recursive)
 		dump_container (c);
 	else
-		mu_container_foreach (c, (MuContainerForeachFunc)dump_container,
-				   NULL);
+		mu_container_foreach
+			(c,
+			 (MuContainerForeachFunc)dump_container,
+			 NULL);
 }
 
 

lib/tests/Makefile.am

@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-INCLUDES=$(XAPIAN_CXXFLAGS)					\
+AM_CPPFLAGS=$(XAPIAN_CXXFLAGS)					\
 	 $(GMIME_CFLAGS)					\
 	 $(GLIB_CFLAGS)						\
 	-I ${top_srcdir}					\