From: Peter H. <pet...@wh...> - 2012-05-01 02:00:43
|
On Mon, Apr 30, 2012 at 11:41:30AM +0100, Bastien Nocera wrote: > On Mon, 2012-04-30 at 15:53 +1000, Peter Hutterer wrote: > > INCLUDES is deprecated in favour of the latter > > In the future, no need to send those for review, use your best > judgement. half of the reason is review, the other half is that some drive-by learning is possible for others as well. The only reason I even know about the INCLUDE vs AM_CPPFLAGS is because I saw Gaetan's patches on the xorg list fixing some of those up. Having patches float past on mailing list is an opportunity for passive learning, it doesn't take the same effort as cloning a repo and looking through the history. > > Signed-off-by: Peter Hutterer <pet...@wh...> > > Reviewed-By: Bastien Nocera <ha...@ha...> thanks. Cheers, Peter > > > --- > > test/Makefile.am | 2 +- > > tools/Makefile.am | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/test/Makefile.am b/test/Makefile.am > > index 090a1e2..72edbaa 100644 > > --- a/test/Makefile.am > > +++ b/test/Makefile.am > > @@ -2,7 +2,7 @@ noinst_PROGRAMS=load dbverify tablet-validity > > > > TESTS=$(noinst_PROGRAMS) > > > > -INCLUDES=-I$(top_srcdir)/libwacom -DTOPSRCDIR="\"$(top_srcdir)\"" > > +AM_CPPFLAGS=-I$(top_srcdir)/libwacom -DTOPSRCDIR="\"$(top_srcdir)\"" > > > > load_LDADD=$(top_builddir)/libwacom/libwacom.la > > dbverify_LDADD=$(top_builddir)/libwacom/libwacom.la > > diff --git a/tools/Makefile.am b/tools/Makefile.am > > index b8b0aef..fcc2069 100644 > > --- a/tools/Makefile.am > > +++ b/tools/Makefile.am > > @@ -1,4 +1,4 @@ > > -INCLUDES=-I$(top_srcdir)/libwacom -DTOPSRCDIR="\"$(top_srcdir)\"" > > +AM_CPPFLAGS=-I$(top_srcdir)/libwacom -DTOPSRCDIR="\"$(top_srcdir)\"" > > > > noinst_PROGRAMS = generate-udev-rules list-devices > > generate_udev_rules_SOURCES = generate-udev-rules.c > > |