From: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Date: Fri, 18 Nov 2022 12:21:16 +0000 (+0000)
Subject: Revert sphinx and reintroduce texinfo make rules.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e33c0019babcb613313ee9a364b65274b4d45c7;p=thirdparty%2Fgcc.git

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 --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 5febe465689e..1c31523371a2 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