From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bznM6-0000Rb-CJ for qemu-devel@nongnu.org; Thu, 27 Oct 2016 12:16:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bznM2-0003OP-N4 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 12:16:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57098) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bznM2-0003OA-Fk for qemu-devel@nongnu.org; Thu, 27 Oct 2016 12:16:34 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C637E7AEA2 for ; Thu, 27 Oct 2016 16:16:33 +0000 (UTC) From: Markus Armbruster References: <20160925181836.18293-1-marcandre.lureau@redhat.com> <20160925181836.18293-7-marcandre.lureau@redhat.com> Date: Thu, 27 Oct 2016 18:16:31 +0200 In-Reply-To: <20160925181836.18293-7-marcandre.lureau@redhat.com> (=?utf-8?Q?=22Marc-Andr=C3=A9?= Lureau"'s message of "Sun, 25 Sep 2016 22:18:31 +0400") Message-ID: <87k2ctdaxs.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 06/11] build-sys: add qapi doc generation targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org Marc-Andr=C3=A9 Lureau writes: > Add qapi doc generation targets, qemu-qapi.texi, qemu-ga-qapi.texi > (implicit pdf works too) and qemu-qapi.txt. The generated > documentation isn't complete yet, so don't bother to build it by > default or install it yet. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > Makefile | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/Makefile b/Makefile > index f103616..6e00559 100644 > --- a/Makefile > +++ b/Makefile > @@ -269,6 +269,7 @@ qemu-ga$(EXESUF): QEMU_CFLAGS +=3D -I qga/qapi-genera= ted > gen-out-type =3D $(subst .,-,$(suffix $@)) >=20=20 > qapi-py =3D $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.= py > +qapi-py +=3D $(SRC_PATH)/scripts/qapi2texi.py >=20=20 > qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h = :\ > $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qap= i-py) > @@ -558,9 +559,23 @@ qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC= _PATH)/scripts/hxtool > qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scr= ipts/hxtool > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN = $@") >=20=20 > +qemu-qapi.txt: qemu-qapi.texi > + $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --plaintex= t $< -o $@,\ > + " GEN $@") Do it with a pattern rule? Next to the %.info: %.texi rule: %.txt: %.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --plainte= xt $< -o $@,\ " GEN $@") > + > qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxt= ool > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN = $@") >=20=20 > +qemu-qapi.texi: $(qapi-modules) $(qapi-py) \ > + $(SRC_PATH)/docs/qemu-qapi.template.texi > + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py \ > + $(SRC_PATH)/docs/qemu-qapi.template.texi $(VERSION) $< > $@," GEN $@= ") Confusing indentation. Elsewhere in this file, we indent like this: qemu-qapi.texi: $(qapi-modules) $(qapi-py) \ $(SRC_PATH)/docs/qemu-qapi.template.texi $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py \ $(SRC_PATH)/docs/qemu-qapi.template.texi $(VERSION) $< > $@," GEN $@= ") > + > +qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json $(qapi-py) \ > + $(SRC_PATH)/docs/qemu-ga-qapi.template.texi > + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py \ > + $(SRC_PATH)/docs/qemu-ga-qapi.template.texi $(VERSION) $< > $@," GEN = $@") Likewise. > + > qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-i= nfo.texi > $(call quiet-command, \ > perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \ Shouldn't you add the two generated .texi to .gitignore?