Message ID | 20200608171556.27847-1-andrew.cooper3@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [for-4.14] docs: Minor build improvements | expand |
On 08.06.2020 19:15, Andrew Cooper wrote: > Don't use "set -x" for the figs rule. It doesn't take effect in the recursive > make environment. I'd rather view this as an unintended debugging leftover. > Turn the HTML manpage comments into makefile comments, not shell comments. > This saves 3x shell invocations per manpage. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com>
> -----Original Message----- > From: Xen-devel <xen-devel-bounces@lists.xenproject.org> On Behalf Of Jan Beulich > Sent: 09 June 2020 11:42 > To: Andrew Cooper <andrew.cooper3@citrix.com> > Cc: Stefano Stabellini <sstabellini@kernel.org>; Julien Grall <julien@xen.org>; Wei Liu <wl@xen.org>; > Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>; George Dunlap <George.Dunlap@eu.citrix.com>; Ian > Jackson <ian.jackson@citrix.com>; Xen-devel <xen-devel@lists.xenproject.org> > Subject: Re: [PATCH for-4.14] docs: Minor build improvements > > On 08.06.2020 19:15, Andrew Cooper wrote: > > Don't use "set -x" for the figs rule. It doesn't take effect in the recursive > > make environment. > > I'd rather view this as an unintended debugging leftover. > > > Turn the HTML manpage comments into makefile comments, not shell comments. > > This saves 3x shell invocations per manpage. > > > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > > Acked-by: Jan Beulich <jbeulich@suse.com> Release-acked-by: Paul Durrant <paul@xen.org>
diff --git a/docs/Makefile b/docs/Makefile index 3eae2dae60..8de1efb6f5 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -58,7 +58,7 @@ txt: $(DOC_TXT) .PHONY: figs figs: ifneq ($(FIG2DEV),) - set -x; $(MAKE) -C figs + $(MAKE) -C figs else @echo "fig2dev (transfig) not installed; skipping figs." endif @@ -105,12 +105,12 @@ else endif # HTML manpages +# sed used to fix up links between man-pages +# 1) L<xl(1)> -> L<xl(1)|relative:xl.1.html> +# 2) <a href="relative:xl.1.html"> -> <a href="xl.1.html"> html/man/%.$(1).html: man/%.$(1).pod Makefile ifneq ($(POD2HTML),) @$(INSTALL_DIR) $$(@D) - # Fix up links between man-pages - # 1) L<xl(1)> -> L<xl(1)|relative:xl.1.html> - # 2) <a href="relative:xl.1.html"> -> <a href="xl.1.html"> sed -r -e 's%L<([^>]+)\(([1-9])\)>%L<\1(\2)|relative:\1.\2.html>%g' $$< | \ $(POD2HTML) | \ sed -r -e 's%( href=")relative:%\1%g' > $$@
Don't use "set -x" for the figs rule. It doesn't take effect in the recursive make environment. Turn the HTML manpage comments into makefile comments, not shell comments. This saves 3x shell invocations per manpage. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: George Dunlap <George.Dunlap@eu.citrix.com> CC: Ian Jackson <ian.jackson@citrix.com> CC: Jan Beulich <JBeulich@suse.com> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Wei Liu <wl@xen.org> CC: Julien Grall <julien@xen.org> For 4.14. Trivial, and docs related. --- docs/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)