On 03/13/2017 01:18 AM, Markus Armbruster wrote: > Rename intermediate qemu-qapi.texi to qemu-qmp-qapi.texi to match its > user qemu-qmp-ref.texi, just like qemu-ga-qapi.texi matches > qemu-ga-ref.texi. > > Build the intermediate .texi next to the sources and the final output > in docs/ instead of dumping them into the build root. > > Fix version.texi dependencies so that only the targets that actually > need it depend on it. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > .gitignore | 10 +++++----- > Makefile | 27 +++++++++++++++------------ > docs/qemu-qmp-ref.texi | 2 +- > rules.mak | 2 +- > 4 files changed, 22 insertions(+), 19 deletions(-) > > diff --git a/.gitignore b/.gitignore > index 2849d75..0e99e6a 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -103,11 +103,11 @@ > /docs/qemu-ga-ref.txt
[1] > /docs/qemu-qmp-ref.html > /docs/qemu-qmp-ref.txt > -docs/qemu-ga-ref.info* > -docs/qemu-qmp-ref.info* > -/qemu-ga-qapi.texi > -/qemu-qapi.texi > -/version.texi > +/docs/qemu-ga-ref.info* worth sorting this line up by [1]? > +/docs/qemu-qmp-ref.info* > +/docs/qemu-ga-qapi.texi > +/docs/qemu-qmp-qapi.texi > +/docs/version.texi > *.tps > .stgit-* > cscope.* > @@ -663,25 +663,28 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ > > # documentation > MAKEINFO=makeinfo > -MAKEINFOFLAGS=--no-split --number-sections > +MAKEINFOFLAGS=--no-split --number-sections -I docs Will this cause grief on any older makinfo versions (such as RHEL 6)? I didn't test myself on those setups. I guess if a buildbot doesn't flag you, it's okay. The sorting issue is worth fixing, but trivial, so you can add: Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
