[gcc(refs/users/marxin/heads/sphinx-v2)] run-time libs: port to sphinx-build

[gcc(refs/users/marxin/heads/sphinx-v2)] run-time libs: port to sphinx-build

[Martin Liska]

https://gcc.gnu.org/g:7152f8be4e1ba3e8ccb418e3f91b6e271b6ebc0d

commit 7152f8be4e1ba3e8ccb418e3f91b6e271b6ebc0d
Author: Martin Liska <mliska@suse.cz>
Date:   Fri Jun 25 10:48:09 2021 +0200

    run-time libs: port to sphinx-build

Diff:
---
 libgomp/Makefile.in     | 10 +++++--
 libitm/Makefile.in      | 70 +++++++++++++--------------------------------
 libquadmath/Makefile.in | 75 ++++++++++---------------------------------------
 3 files changed, 41 insertions(+), 114 deletions(-)

diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index a8fe8510b49..8d89dc1bdb5 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -821,10 +821,10 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool config.lt
 
-doc/pdf/latex/libgomp.pdf: $(SPHINX_CONFIG_FILES)
+doc/pdf/latex/libgomp.pdf: $(SPHINX_FILES)
 	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/pdf
 
-doc/html/html/index.html: $(SPHINX_CONFIG_FILES)
+doc/html/html/index.html: $(SPHINX_FILES)
 	+ make -C $(srcdir)/../doc html SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/html
 
 uninstall-info-am:
@@ -1321,6 +1321,10 @@ env.o: libgomp_f.h
 
 all-local: $(STAMP_GENINSRC)
 
+RST_FILES:=$(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
+
 export VERSION_PACKAGE=$(PACKAGE_VERSION)
 export BUGURL=$(PACKAGE_BUGURL)
 
@@ -1328,7 +1332,7 @@ stamp-geninsrc: doc/info/texinfo/libgomp.info
 	cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info
 	@touch $@
 
-doc/info/texinfo/libgomp.info: $(SPHINX_CONFIG_FILES)
+doc/info/texinfo/libgomp.info: $(SPHINX_FILES)
 	+ make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/info
 
 # target overrides
diff --git a/libitm/Makefile.in b/libitm/Makefile.in
index 7f53ea9b9db..d370d57e9a8 100644
--- a/libitm/Makefile.in
+++ b/libitm/Makefile.in
@@ -258,18 +258,10 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
 am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
 am__v_texidevnull_0 = > /dev/null
 am__v_texidevnull_1 = 
-INFO_DEPS = libitm.info
+INFO_DEPS = doc/info/texinfo/libitm.info
 am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include
-DVIS = libitm.dvi
-PDFS = libitm.pdf
-PSS = libitm.ps
-HTMLS = libitm.html
-TEXINFOS = libitm.texi
-TEXI2DVI = texi2dvi
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
-MAKEINFOHTML = $(MAKEINFO) --html
-AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-DVIPS = dvips
+PDFS = doc/pdf/latex/libitm.pdf
+HTMLS = doc/html/html/index.html
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -690,39 +682,11 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool config.lt
 
-libitm.dvi: libitm.texi  
-	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
-	`test -f 'libitm.texi' || echo '$(srcdir)/'`libitm.texi
-
-libitm.pdf: libitm.texi  
-	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
-	`test -f 'libitm.texi' || echo '$(srcdir)/'`libitm.texi
-
-libitm.html: libitm.texi  
-	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
-	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $(@:.html=.htp) `test -f 'libitm.texi' || echo '$(srcdir)/'`libitm.texi; \
-	then \
-	  rm -rf $@ && mv $(@:.html=.htp) $@; \
-	else \
-	  rm -rf $(@:.html=.htp); exit 1; \
-	fi
-.dvi.ps:
-	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) $(AM_V_texinfo) -o $@ $<
+doc/pdf/latex/libitm.pdf: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/pdf
 
-uninstall-dvi-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(dvidir)/$$f"; \
-	done
+doc/html/html/index.html: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc html SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/html
 
 uninstall-html-am:
 	@$(NORMAL_UNINSTALL)
@@ -795,8 +759,8 @@ mostlyclean-aminfo:
 	-rm -rf libitm.t2d libitm.t2p
 
 clean-aminfo:
-	-test -z "libitm.dvi libitm.pdf libitm.ps libitm.html" \
-	|| rm -rf libitm.dvi libitm.pdf libitm.ps libitm.html
+	-test -z "doc/pdf/latex/libitm.pdf libitm.html" \
+	|| rm -rf doc/pdf/latex/libitm.pdf libitm.html
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -1186,16 +1150,20 @@ vpath % $(strip $(search_path))
 
 all-local: $(STAMP_GENINSRC)
 
-stamp-geninsrc: libitm.info
-	cp -p $(top_builddir)/libitm.info $(srcdir)/libitm.info
-	@touch $@
+RST_FILES:=$(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
 
-libitm.info: $(STAMP_BUILD_INFO)
+export VERSION_PACKAGE=$(PACKAGE_VERSION)
+export BUGURL=$(PACKAGE_BUGURL)
 
-stamp-build-info: libitm.texi
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libitm.info $(srcdir)/libitm.texi
+stamp-geninsrc: doc/info/texinfo/libitm.info
+	cp -p $(top_builddir)/libitm.info $(srcdir)/libitm.info
 	@touch $@
 
+doc/info/texinfo/libitm.info: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/info
+
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the
 # comments below.
diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 8c011212258..cdfaaa56635 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -283,18 +283,10 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
 am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
 am__v_texidevnull_0 = > /dev/null
 am__v_texidevnull_1 = 
-INFO_DEPS = libquadmath.info
+INFO_DEPS = doc/info/texinfo/libquadmath.info
 am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include
-DVIS = libquadmath.dvi
-PDFS = libquadmath.pdf
-PSS = libquadmath.ps
-HTMLS = libquadmath.html
-TEXINFOS =
-TEXI2DVI = texi2dvi
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
-MAKEINFOHTML = $(MAKEINFO) --html
-AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-DVIPS = dvips
+PDFS = doc/pdf/latex/libquadmath.pdf
+HTMLS = doc/html/html/index.html
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -563,10 +555,6 @@ AUTOMAKE_OPTIONS = foreign info-in-builddir
 TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
 
 # Defines info, dvi, pdf and html targets
-MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
-@BUILD_LIBQUADMATH_FALSE@info_TEXINFOS = 
-@BUILD_LIBQUADMATH_TRUE@info_TEXINFOS = libquadmath.texi
-libquadmath_TEXINFOS = libquadmath-vers.texi
 MULTISRCTOP = 
 MULTIBUILDTOP = 
 MULTIDIRS = 
@@ -991,39 +979,11 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool config.lt
 
-libquadmath.dvi: libquadmath.texi $(libquadmath_TEXINFOS) 
-	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
-	`test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi
-
-libquadmath.pdf: libquadmath.texi $(libquadmath_TEXINFOS) 
-	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
-	`test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi
-
-libquadmath.html: libquadmath.texi $(libquadmath_TEXINFOS) 
-	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
-	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $(@:.html=.htp) `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi; \
-	then \
-	  rm -rf $@ && mv $(@:.html=.htp) $@; \
-	else \
-	  rm -rf $(@:.html=.htp); exit 1; \
-	fi
-.dvi.ps:
-	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) $(AM_V_texinfo) -o $@ $<
+doc/pdf/latex/libquadmath.pdf: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/pdf
 
-uninstall-dvi-am:
-	@$(NORMAL_UNINSTALL)
-	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(dvidir)/$$f"; \
-	done
+doc/html/html/index.html: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc html SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/html
 
 uninstall-html-am:
 	@$(NORMAL_UNINSTALL)
@@ -1434,22 +1394,17 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@	   sed 's,\([^/ 	]*\)\.l\([ao]\),.libs/\1.\2,g'` \
 @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@	 > $@ || (rm -f $@ ; exit 1)
 
-@BUILD_LIBQUADMATH_TRUE@stamp-geninsrc: libquadmath.info
-@BUILD_LIBQUADMATH_TRUE@	cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
-@BUILD_LIBQUADMATH_TRUE@	@touch $@
-
-@BUILD_LIBQUADMATH_TRUE@stamp-build-info: libquadmath.texi $(libquadmath_TEXINFOS)
-@BUILD_LIBQUADMATH_TRUE@	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
-@BUILD_LIBQUADMATH_TRUE@	@touch $@
-
 all-local: $(ALL_LOCAL_DEPS)
 
-# Unconditionally override this target, so that automake's definition
-# does not wrongly interfere.
-libquadmath.info: $(STAMP_BUILD_INFO)
+RST_FILES:=$(shell find $(srcdir) -name *.rst)
+SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
+SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
+
+export VERSION_PACKAGE=$(PACKAGE_VERSION)
+export BUGURL=$(REPORT_BUGS_TO)
 
-libquadmath-vers.texi:
-	echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@
+doc/info/texinfo/libquadmath.info: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc BUILDDIR=`pwd`/doc/info
 
 # GNU Make needs to see an explicit $(MAKE) variable in the command it
 # runs to enable its job server during parallel builds.  Hence the