public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/sphinx-v2)] libiberty: integrate info to sphinx-build
@ 2021-06-24 15:11 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2021-06-24 15:11 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:2a2ac6fa1f1b0fabe8b98d982c2bc5261a41c33c
commit 2a2ac6fa1f1b0fabe8b98d982c2bc5261a41c33c
Author: Martin Liska <mliska@suse.cz>
Date: Thu Jun 24 16:43:55 2021 +0200
libiberty: integrate info to sphinx-build
Diff:
---
doc/baseconf.py | 2 +-
libiberty/Makefile.in | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/doc/baseconf.py b/doc/baseconf.py
index 206328d43e5..c50dcc57299 100644
--- a/doc/baseconf.py
+++ b/doc/baseconf.py
@@ -36,7 +36,7 @@ gcc_REVISION = __read_file('REVISION')
VERSION_PACKAGE = os.getenv('VERSION_PACKAGE')
BUGURL = os.getenv('BUGURL')
-assert VERSION_PACKAGE and BUGURL
+assert VERSION_PACKAGE is not None and BUGURL is not None
# The short X.Y version.
version = gcc_BASEVER
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 4f1213b983b..f38a5885048 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -273,7 +273,7 @@ $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES)
$(REQUIRED_OFILES) $(CONFIGURED_OFILES)
$(RANLIB) $(TESTLIB)
-info: libiberty.info info-subdir
+info: doc/texinfo/libiberty.info info-subdir
install-info: install-info-subdir
clean-info: clean-info-subdir
dvi: libiberty.dvi dvi-subdir
@@ -338,6 +338,16 @@ TEXISRC = \
# elsewhere. Others represent headers in ../include.
TEXIFILES = fnmatch.txh pexecute.txh simple-object.txh
+export VERSION_PACKAGE=
+export BUGURL=
+
+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)
+
+doc/texinfo/libiberty.info: $(SPHINX_CONFIG_FILES)
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc BUILDDIR=doc/info
+
libiberty.info : $(srcdir)/libiberty.texi $(TEXISRC)
$(MAKEINFO) -I$(srcdir) $(srcdir)/libiberty.texi
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-24 15:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-24 15:11 [gcc(refs/users/marxin/heads/sphinx-v2)] libiberty: integrate info to sphinx-build Martin Liska
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).