[Qemu-devel] [PATCH] Makefile: Add qemu-doc.txt to distclean and dependencies

[Qemu-devel] [PATCH] Makefile: Add qemu-doc.txt to distclean and dependencies

[Peter Maydell]

When qemu-doc.txt was added as a new output format in
commit f8bab10b4c3f, it was not added to either the
list of files to remove in distclean or to the dependency
line that forces qemu-options.texi to be built before
attempting to build qemu-doc.*.

In particular, the missing dependency meant that on
some platforms (notably OSX hosts) we would try to
build qemu-doc.txt before qemu-options.texi had been
fully written out, and then makeinfo would complain
about missing cross-reference targets.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9f8968d..c166d2d 100644
--- a/Makefile
+++ b/Makefile
@@ -393,7 +393,7 @@ distclean: clean
 	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps
 	rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys
 	rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp
-	rm -f qemu-doc.vr
+	rm -f qemu-doc.vr qemu-doc.txt
 	rm -f config.log
 	rm -f linux-headers/asm
 	rm -f qemu-ga-qapi.texi qemu-qapi.texi
@@ -590,7 +590,7 @@ info: qemu-doc.info docs/qemu-qmp-ref.info docs/qemu-ga-ref.info
 pdf: qemu-doc.pdf docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf
 txt: qemu-doc.txt docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt
 
-qemu-doc.html qemu-doc.info qemu-doc.pdf: \
+qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \
 	qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \
 	qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \
 	qemu-monitor-info.texi
-- 
2.7.4

Re: [Qemu-devel] [PATCH] Makefile: Add qemu-doc.txt to distclean and dependencies

[Marc-André Lureau]

Hi

On Tue, Jan 24, 2017 at 6:05 PM Peter Maydell <peter.maydell@linaro.org>
wrote:

> When qemu-doc.txt was added as a new output format in
> commit f8bab10b4c3f, it was not added to either the
> list of files to remove in distclean or to the dependency
> line that forces qemu-options.texi to be built before
> attempting to build qemu-doc.*.
>
> In particular, the missing dependency meant that on
> some platforms (notably OSX hosts) we would try to
> build qemu-doc.txt before qemu-options.texi had been
> fully written out, and then makeinfo would complain
> about missing cross-reference targets.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>


good catch, sorry about the regression

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


---
>  Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 9f8968d..c166d2d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -393,7 +393,7 @@ distclean: clean
>         rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps
>         rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky
> qemu-doc.kys
>         rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc
> qemu-doc.tp
> -       rm -f qemu-doc.vr
> +       rm -f qemu-doc.vr qemu-doc.txt
>         rm -f config.log
>         rm -f linux-headers/asm
>         rm -f qemu-ga-qapi.texi qemu-qapi.texi
> @@ -590,7 +590,7 @@ info: qemu-doc.info docs/qemu-qmp-ref.info docs/
> qemu-ga-ref.info
>  pdf: qemu-doc.pdf docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf
>  txt: qemu-doc.txt docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt
>
> -qemu-doc.html qemu-doc.info qemu-doc.pdf: \
> +qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \
>         qemu-img.texi qemu-nbd.texi qemu-options.texi
> qemu-option-trace.texi \
>         qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \
>         qemu-monitor-info.texi
> --
> 2.7.4
>
>
> --
Marc-André Lureau

Re: [Qemu-devel] [PATCH] Makefile: Add qemu-doc.txt to distclean and dependencies

[Peter Maydell]

On 24 January 2017 at 14:16, Marc-André Lureau
<marcandre.lureau@gmail.com> wrote:
> Hi
>
> On Tue, Jan 24, 2017 at 6:05 PM Peter Maydell <peter.maydell@linaro.org>
> wrote:
>>
>> When qemu-doc.txt was added as a new output format in
>> commit f8bab10b4c3f, it was not added to either the
>> list of files to remove in distclean or to the dependency
>> line that forces qemu-options.texi to be built before
>> attempting to build qemu-doc.*.
>>
>> In particular, the missing dependency meant that on
>> some platforms (notably OSX hosts) we would try to
>> build qemu-doc.txt before qemu-options.texi had been
>> fully written out, and then makeinfo would complain
>> about missing cross-reference targets.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>
>
>
> good catch, sorry about the regression
>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Thanks; applied to master as a buildfix.

-- PMM