* use AM_CPPFLAGS instead of INCLUDES

2012-12-22 22:54:50 +02:00
parent 4f37e979e1
commit c5f8ea6451
10 changed files with 14 additions and 12 deletions
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
 # before decending into tests/
 SUBDIRS= . tests

-INCLUDES=-I${top_srcdir}/lib $(GLIB_CFLAGS)
+AM_CPPFLAGS=-I${top_srcdir}/lib $(GLIB_CFLAGS)

 # don't use -Werror, as it might break on other compilers
 # use -Wno-unused-parameters, because some callbacks may not
--- a/mu/tests/Makefile.am
+++ b/mu/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}						\