From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 19791384F4A9; Fri, 18 Nov 2022 12:25:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19791384F4A9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668774338; bh=G4L/PY5Hhr+In29cwQC88/1t53TVOkvO5u8St1Rkfp0=; h=From:To:Subject:Date:From; b=pbMjx0KhlpztsWvhLuGFWUWpWdLWb8bYsQ5C36xNlGTCZNKhB87na68FQQvXHhzJ7 PvdNf15LzdkwfqKDC74Z6Zo5AIDWWqT7pHRMqGA9VELFhNQ7y9I2B2afOcVX5uA8Wv m2z/nCWCIHyRdkq+L7wMpnhrkV8n8O9mcwYr9VTU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/modula-2] Revert sphinx and reintroduce texinfo make rules. X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/devel/modula-2 X-Git-Oldrev: 59f312880bdcfe9602c37adaf30745160ae3a994 X-Git-Newrev: 1e33c0019babcb613313ee9a364b65274b4d45c7 Message-Id: <20221118122538.19791384F4A9@sourceware.org> Date: Fri, 18 Nov 2022 12:25:38 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1e33c0019babcb613313ee9a364b65274b4d45c7 commit 1e33c0019babcb613313ee9a364b65274b4d45c7 Author: Gaius Mulley Date: Fri Nov 18 12:21:16 2022 +0000 Revert sphinx and reintroduce texinfo make rules. gcc/m2/ChangeLog: * Make-lang.in: Revert rules to build documentation from texinfo sources. Signed-off-by: Gaius Mulley Diff: --- gcc/m2/Make-lang.in | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index 5febe465689..1c31523371a 100644 --- a/gcc/m2/Make-lang.in +++ b/gcc/m2/Make-lang.in @@ -102,30 +102,10 @@ m2.all.cross: gm2-cross$(exeext) plugin/m2rte$(exeext).so m2.start.encap: gm2$(exeext) plugin/m2rte$(exeext).so m2.rest.encap: -# Documentation. -doc/m2/info/texinfo/gm2.info: $(SPHINX_FILES) - + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ - make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/m2/doc/ BUILDDIR=$(objdir)/doc/gm2/info SPHINXBUILD=$(SPHINX_BUILD); \ - else true; fi - -doc/m2/pdf/latex/gm2.pdf: $(SPHINX_FILES) - + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/m2/doc/ BUILDDIR=$(objdir)/doc/gm2/pdf SPHINXBUILD=$(SPHINX_BUILD) - -doc/m2/html/html/index.html: $(SPHINX_FILES) - + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/m2/doc/ BUILDDIR=$(objdir)/doc/gm2/html SPHINXBUILD=$(SPHINX_BUILD) - -m2.man: doc/m2/man/man/gm2.1 - -m2.srcman: doc/m2/man/man/gm2.1 - -cp -p $^ $(srcdir)/doc +m2.info: doc/m2.info -doc/m2/man/man/gm2.1: $(SPHINX_FILES) - + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/m2/doc BUILDDIR=$(objdir)/doc/m2/man SPHINXBUILD=$(SPHINX_BUILD) - -# m2.info: doc/m2.info - -# m2.man: doc/m2.1 +m2.man: doc/m2.1 m2.install-man: $(DESTDIR)$(man1dir)/$(GM2_INSTALL_NAME)$(man1ext) @@ -143,8 +123,6 @@ m2.ps: m2.dvi m2.pdf: m2.ps gs -q -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$@ $< -m2.doc: $(RSTSRC) - .INTERMEDIATE: gm2.pod m2.pod: doc/gm2.texi $(TEXISRC) @@ -165,6 +143,8 @@ $(objdir)/m2/images/gnu.eps: $(srcdir)/m2/images/gnupng pngtopnm $< | pnmtops -noturn > $@ ; \ fi +.INTERMEDIATE: gm2.pod + # gm2-libs.texi m2/gm2-libs.texi: gm2-libs.texi-check; @true