[Libvir] gnulib: take2, trunk-relative patch

[Jim Meyering]

"Daniel P. Berrange" <berrange at redhat.com> wrote:

> On Wed, Dec 05, 2007 at 05:36:48PM +0100, Jim Meyering wrote:
>> "Daniel P. Berrange" <berrange at redhat.com> wrote:
>> > On Wed, Dec 05, 2007 at 03:08:11PM +0100, Jim Meyering wrote:
>> >> Here's the complete patch (but still none of the new files), rebased
>> >> and relative to the trunk.  As before, this passes "make distcheck".
>> >> And as Daniel Veillard noted, you'd need git.
>> >>
>> >> However the next patch will cvs-add all of the bootstrap-imported
>> >> files, so you won't need git unless you want to try this particular patch.
>> >
>> >> diff --git a/Makefile.am b/Makefile.am
>> >> index eaa204e..1f2ca52 100644
>> >> --- a/Makefile.am
>> >> +++ b/Makefile.am
>> >> @@ -1,8 +1,9 @@
>> >>  ## Process this file with automake to produce Makefile.in
>> >>
>> >> -SUBDIRS = src qemud proxy include docs @PYTHON_SUBDIR@ tests po m4 scripts
>> >> +SUBDIRS = gnulib/lib src qemud proxy include docs @PYTHON_SUBDIR@ \
>> >> +  tests/gnulib tests po scripts
>> >
>> > Shouldn't the gnulib/lib  SUBDIR actually just be 'gnulib' and then
>> > a gnulib/Makefile.am  have SUBDIRS = lib
>>
>> There's no need for that.  Doing it the way I did avoids adding
>> a nearly-empty and otherwise-useless gnulib/Makefile.am.
>>
>> > Likewise, the tests/gnulib, should just be in the SUBDIRS target for
>> > the tests/Makefile.am
>>
>> I put "tests/gnulib" before "tests" there to make it clear that the
>> gnulib tests run before any bit of libvirt's own unit tests.
>> Either way works.
>
> We already have many SUBDIRS listed in the tests/Makefile.am, so having one
> listed elsewhere is very confusing.

Well then, how about moving tests/gnulib into gnulib/tests?