Re: [PATCH] fix out-of-tree builds

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Mar 21, 2014 at 10:55:44AM +0100, Daniel Vetter wrote:
> >  tests/Makefile.am | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tests/Makefile.am b/tests/Makefile.am
> > index aadcbc8..ddb0fd7 100644
> > --- a/tests/Makefile.am
> > +++ b/tests/Makefile.am
> > @@ -24,7 +24,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
> >  	-I$(srcdir)/.. \
> >  	-I$(srcdir)/../lib \
> >  	-include "$(srcdir)/../lib/check-ndebug.h" \
> > -	-include "$(srcdir)/../version.h" \
> > +	-include "$(builddir)/version.h" \

This did look fishy (going from $srcdir/.. to $builddir) and is not
correct :)

srcdir is the current source dir
builddir is the current build dir

both of those variable represent where the current directory is, in a
recursive setup this means inside tests/.

top_builddir/top_srcdir can be used to represent the topmost directory
in each case.

This should be either:
  - $(top_builddir)/version.h or
  - $(builddir)/../version.h

It happens to work because it's evaluated to "-include "./version.h",
and top_builddir is included by automake's default include search
paths.

DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

-- 
Damien
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux