public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Gaius Mulley <gaius@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/modula-2] Revert sphinx and reintroduce texinfo make rules.
Date: Fri, 18 Nov 2022 12:25:38 +0000 (GMT)	[thread overview]
Message-ID: <20221118122538.19791384F4A9@sourceware.org> (raw)

https://gcc.gnu.org/g:1e33c0019babcb613313ee9a364b65274b4d45c7

commit 1e33c0019babcb613313ee9a364b65274b4d45c7
Author: Gaius Mulley <gaius.mulley@southwales.ac.uk>
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 <gaius.mulley@southwales.ac.uk>

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

                 reply	other threads:[~2022-11-18 12:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221118122538.19791384F4A9@sourceware.org \
    --to=gaius@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).